Add real link time dependencies for $(PROGRAM).

This commit is contained in:
ramiro@netscape.com
1999-08-24 12:37:15 +00:00
parent 9f37cd96e7
commit d0c16e2530
2 changed files with 46 additions and 9 deletions
+12 -2
View File
@@ -98,7 +98,6 @@ BASE_LIBS = \
GECKO_LIBS = \
-lwidgetsupport_s \
-lraptorgfx \
$(TIMER_LIBS) \
$(NULL)
IMGLIB_LIBS = \
@@ -130,12 +129,20 @@ ifeq (,$(filter beos os2 rhapsody photon,$(MOZ_WIDGET_TOOLKIT)))
UNIX_VIEWER_TK_LIBS = -lviewer_$(MOZ_WIDGET_TOOLKIT)_s
endif
XP_LIBS = \
XP_DIST_LIBS = \
$(GECKO_LIBS) \
$(NETLIB_LIBS) \
$(IMGLIB_LIBS) \
$(TIMER_LIBS) \
$(BASE_LIBS) \
$(JSJ_LIB) \
$(NULL)
# cls/shaver are responsible for this amazingness
EXTRA_DEPS = $(addprefix $(DIST)/,$(patsubst -l%,bin/lib%.so,$(XP_DIST_LIBS:-l%_s=lib/lib%_s.a)))
XP_LIBS = \
$(XP_DIST_LIBS) \
$(NSPR_LIBS) \
$(NULL)
@@ -219,3 +226,6 @@ install:: $(PROGRAM)_motif
endif
caca:
@echo $(EXTRA_DEPS)
+34 -7
View File
@@ -58,18 +58,45 @@ ifdef MOZ_MONOLITHIC_TOOLKIT
endif
ifdef MOZ_OJI
OJI_LIBS=-loji -ljsj
OJI_LIBS =\
-loji
-ljsj \
$(NULL)
endif
LIBS += \
-lraptorgfx \
$(TIMER_LIBS) \
BASE_LIBS =\
-lmozjs \
$(OJI_LIBS) \
-limg \
-lmozutil \
-lxpcom \
-lmozutil \
$(NULL)
GECKO_LIBS =\
-lraptorgfx \
$(NULL)
IMGLIB_LIBS =\
-limg \
$(NULL)
XP_DIST_LIBS = \
$(GECKO_LIBS) \
$(NETLIB_LIBS) \
$(IMGLIB_LIBS) \
$(TIMER_LIBS) \
$(BASE_LIBS) \
$(OJI_LIBS) \
$(NULL)
# cls/shaver are responsible for this amazingness
EXTRA_DEPS = $(addprefix $(DIST)/,$(patsubst -l%,bin/lib%.so,$(XP_DIST_LIBS:-l%_s=lib/lib%_s.a)))
XP_LIBS = \
$(XP_DIST_LIBS) \
$(NSPR_LIBS) \
$(NULL)
LIBS =\
$(XP_LIBS) \
$(MONOLITHIC_TK_FLAGS) \
$(NULL)