From d0c16e25304bb9fb034aeeb1861d52a2008aa220 Mon Sep 17 00:00:00 2001 From: "ramiro@netscape.com" Date: Tue, 24 Aug 1999 12:37:15 +0000 Subject: [PATCH] Add real link time dependencies for $(PROGRAM). --- webshell/tests/viewer/Makefile.in | 14 +++++++++-- xpfe/bootstrap/Makefile.in | 41 +++++++++++++++++++++++++------ 2 files changed, 46 insertions(+), 9 deletions(-) diff --git a/webshell/tests/viewer/Makefile.in b/webshell/tests/viewer/Makefile.in index e4b60034a9c3..21507a8b6471 100644 --- a/webshell/tests/viewer/Makefile.in +++ b/webshell/tests/viewer/Makefile.in @@ -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) + diff --git a/xpfe/bootstrap/Makefile.in b/xpfe/bootstrap/Makefile.in index abb3d63b5ce5..eb8214f09af8 100644 --- a/xpfe/bootstrap/Makefile.in +++ b/xpfe/bootstrap/Makefile.in @@ -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)