Finally following warren's lead from "last year", the libs phase has been removed from the build. Directories had to be ordered and in some cases, traversed after a subsequent module was built.

Fixed the recursive makes into GtkMozilla so that they will report build failures like the other dirs. Removed LIBS_NEQ_INSTALL variable and associated ifdefs.
2024-11-24 21:31:04 +00:00 · 2000-03-02 13:29:03 +00:00 · 2000-03-02 13:29:03 +00:00 · 192e307283
commit 192e307283
parent f8ec204a17
15 changed files with 48 additions and 110 deletions
--- a/Makefile.in
+++ b/Makefile.in
@ -49,7 +49,7 @@ ifdef GC_LEAK_DETECTOR
 DIRS += gc/boehm
 endif

-DIRS		+= dbm modules/libreg xpcom
+DIRS		+= dbm modules/libreg xpcom js

 ifndef MOZ_NATIVE_ZLIB
 DIRS		+= modules/zlib
@ -60,12 +60,12 @@ DIRS		+= jpeg
 endif

 DIRS		+= \
+		widget/timer \
 		include \
 		modules/libutil \
 		netwerk \
 		uriloader \
 		intl \
-		js \
 		modules/libpref \
 		modules/libimg \
 		modules/oji \
@ -74,7 +74,6 @@ DIRS		+= \
 		caps \
 		expat \
 		htmlparser \
-		widget/timer \
 		gfx \
 		dom \
 		view \
@ -112,6 +111,10 @@ ifdef MOZ_JPROF
 DIRS        += tools/jprof
 endif

+ifdef ENABLE_TESTS
+DIRS		+= xpcom/tests
+endif
+
 include $(topsrcdir)/config/rules.mk

 real_all: all
--- a/config/config.mk
+++ b/config/config.mk
@ -39,11 +39,6 @@ endif
 #
 NS_CONFIG_MK	= 1

-#
-# Force a final install pass so we can build tests properly.
-#
-LIBS_NEQ_INSTALL = 1
-
 # This wastes time.
 include $(topsrcdir)/config/common.mk

--- a/config/rules.mk
+++ b/config/rules.mk
@ -369,8 +369,7 @@ endif
 export:: $(SUBMAKEFILES) $(MAKE_DIRS)
 	+$(LOOP_OVER_DIRS)

-ifndef LIBS_NEQ_INSTALL
-libs install:: $(SUBMAKEFILES) $(MAKE_DIRS) $(LIBRARY) $(SHARED_LIBRARY) $(PROGRAM) $(SIMPLE_PROGRAMS) $(MAPS)
+install:: $(SUBMAKEFILES) $(MAKE_DIRS) $(LIBRARY) $(SHARED_LIBRARY) $(PROGRAM) $(SIMPLE_PROGRAMS) $(MAPS)
 ifndef NO_STATIC_LIB
 ifdef LIBRARY
 ifdef IS_COMPONENT
@ -405,66 +404,6 @@ ifdef SIMPLE_PROGRAMS
 	$(INSTALL) -m 555 $(SIMPLE_PROGRAMS) $(DIST)/bin
 endif
 	+$(LOOP_OVER_DIRS)
-else
-libs:: $(SUBMAKEFILES) $(MAKE_DIRS) $(LIBRARY) $(SHARED_LIBRARY) $(SHARED_LIBRARY_LIBS)
-ifndef NO_STATIC_LIB
-ifdef LIBRARY
-ifdef IS_COMPONENT
-	$(INSTALL) -m 444 $(LIBRARY) $(DIST)/lib/components
-else
-	$(INSTALL) -m 444 $(LIBRARY) $(DIST)/lib
-endif
-endif
-endif
-ifdef SHARED_LIBRARY
-ifdef IS_COMPONENT
-	$(INSTALL) -m 555 $(SHARED_LIBRARY) $(DIST)/lib/components
-	$(INSTALL) -m 555 $(SHARED_LIBRARY) $(DIST)/bin/components
-ifeq ($(OS_ARCH),OpenVMS)
-	$(INSTALL) -m 555 $(SHARED_LIBRARY:.$(DLL_SUFFIX)=.vms) $(DIST)/bin/components
-endif
-ifdef NEED_BASE_DLL_NAME_ALSO
-	@cd $(DIST)/lib/components; ln -s $(SHARED_LIBRARY) lib$(LIBRARY_NAME).so
-	@cd $(DIST)/bin/components; ln -s $(SHARED_LIBRARY) lib$(LIBRARY_NAME).so
-endif
-else
-	$(INSTALL) -m 555 $(SHARED_LIBRARY) $(DIST)/lib
-	$(INSTALL) -m 555 $(SHARED_LIBRARY) $(DIST)/bin
-ifeq ($(OS_ARCH),OpenVMS)
-	$(INSTALL) -m 555 $(SHARED_LIBRARY:.$(DLL_SUFFIX)=.vms) $(DIST)/bin
-endif
-ifdef NEED_BASE_DLL_NAME_ALSO
-	@cd $(DIST)/lib; ln -s $(SHARED_LIBRARY) lib$(LIBRARY_NAME).so
-	@cd $(DIST)/bin; ln -s $(SHARED_LIBRARY) lib$(LIBRARY_NAME).so
-endif
-endif
-endif
-	+$(LOOP_OVER_DIRS)
-
-install:: $(SUBMAKEFILES) $(PROGRAM) $(SIMPLE_PROGRAMS)
-ifdef MAPS
-	$(INSTALL) -m 444 $(MAPS) $(DIST)/bin
-endif
-ifdef PROGRAM
-	$(INSTALL) -m 555 $(PROGRAM) $(DIST)/bin
-ifeq ($(OS_ARCH),BeOS)
-	-rm components add-ons lib
-	ln -sf $(DIST)/bin/components components
-	ln -sf $(DIST)/bin add-ons
-	ln -sf $(DIST)/bin lib
-endif
-endif
-ifdef SIMPLE_PROGRAMS
-	$(INSTALL) -m 555 $(SIMPLE_PROGRAMS) $(DIST)/bin
-ifeq ($(OS_ARCH),BeOS)
-	-rm components add-ons lib
-	ln -sf $(DIST)/bin/components components
-	ln -sf $(DIST)/bin add-ons
-	ln -sf $(DIST)/bin lib
-endif
-endif
-	+$(LOOP_OVER_DIRS)
-endif

 checkout:
 	cd $(topsrcdir); $(MAKE) -f client.mk checkout
--- a/layout/Makefile.in
+++ b/layout/Makefile.in
@ -34,5 +34,9 @@ endif

 DIRS           += events build

+ifdef ENABLE_TESTS
+DIRS		+= html/tests
+endif
+
 include $(topsrcdir)/config/rules.mk

--- a/layout/html/Makefile.in
+++ b/layout/html/Makefile.in
@ -28,8 +28,4 @@ include $(DEPTH)/config/autoconf.mk

 DIRS		= base content document forms style table

-ifdef ENABLE_TESTS
-DIRS		+= tests
-endif
-
 include $(topsrcdir)/config/rules.mk
--- a/webshell/embed/Makefile.in
+++ b/webshell/embed/Makefile.in
@ -31,21 +31,24 @@ DIRS		= xlib
 endif

 ifdef MOZ_ENABLE_GTK_MOZILLA
-all:: export libs install
+all:: export install

 export depend::

-libs::
-	@cd gtk && $(MAKE) && cd ..
-
 install::
-	@cd gtk && $(MAKE) install && cd ..
+	@$(CONTINUE_ON_ERROR) \
+	$(MAKE) -C gtk install; \
+	$(EXIT_ON_ERROR)

 clean clobber clobber_all realclean::
-	@cd gtk && $(MAKE) clean && cd ..
+	@$(CONTINUE_ON_ERROR) \
+	$(MAKE) -C gtk clean; \
+	$(EXIT_ON_ERROR)

 distclean::
-	@cd gtk && $(MAKE) distclean && cd ..
+	@$(CONTINUE_ON_ERROR) \
+	$(MAKE) -C gtk distclean; \
+	$(EXIT_ON_ERROR)
 endif

 include $(topsrcdir)/config/rules.mk
--- a/webshell/tests/viewer/Makefile.in
+++ b/webshell/tests/viewer/Makefile.in
@ -26,9 +26,9 @@ VPATH			= @srcdir@

 include $(DEPTH)/config/autoconf.mk

-DIRS			= public
+DIRS			:= public

-PROGRAM			= viewer
+PROGRAM			:= viewer

 CPPSRCS			= \
 			$(TOOLKIT_CPPSRCS) \
@ -78,7 +78,7 @@ EXPORT_RESOURCE_THROBBER := $(wildcard $(srcdir)/throbber/anim*.gif)

 ifeq (,$(filter beos os2 rhapsody photon,$(MOZ_WIDGET_TOOLKIT)))
 DIRS			+= unix
-UNIX_VIEWER_TK_LIBS	= $(DIST)/lib/libviewer_$(MOZ_WIDGET_TOOLKIT)_s.a
+UNIX_VIEWER_TK_LIBS	= unix/$(MOZ_WIDGET_TOOLKIT)/libviewer_$(MOZ_WIDGET_TOOLKIT)_s.a
 else
 ifeq ($(MOZ_WIDGET_TOOLKIT),beos)
 BEOS_PROGRAM_RESOURCE	= $(srcdir)/viewer-beos.rsrc
@ -160,19 +160,31 @@ install:: $(PROGRAM) $(srcdir)/mozilla-viewer.sh
 	$(INSTALL) $(srcdir)/resources/viewer.properties $(DIST)/bin/res
 	$(INSTALL) $(srcdir)/mozilla-viewer.sh $(DIST)/bin

-$(PROGRAM)_gtk: $(PROGOBJS) $(EXTRA_DEPS) Makefile Makefile.in $(DIST)/lib/libviewer_gtk_s.a
+unix/gtk/libviewer_gtk_s.a:
+	@$(MAKE) -C $(@D) $(@F)
+
+unix/motif/libviewer_motif_s.a:
+	@$(MAKE) -C $(@D) $(@F)
+
+unix/qt/libviewer_qt_s.a:
+	@$(MAKE) -C $(@D) $(@F)
+
+unix/xlib/libviewer_xlib_s.a:
+	@$(MAKE) -C $(@D) $(@F)
+
+$(PROGRAM)_gtk: $(PROGOBJS) $(EXTRA_DEPS) Makefile Makefile.in unix/gtk/libviewer_gtk_s.a
 	$(CCC) -o $@ $(PROGOBJS) $(LDFLAGS) $(LIBS_DIR) $(GTK_LIBS) $(OS_LIBS)
 	$(MOZ_POST_PROGRAM_COMMAND) $@

-$(PROGRAM)_motif: $(PROGOBJS) $(EXTRA_DEPS) Makefile Makefile.in $(DIST)/lib/libviewer_motif_s.a
+$(PROGRAM)_motif: $(PROGOBJS) $(EXTRA_DEPS) Makefile Makefile.in unix/motif/libviewer_motif_s.a
 	$(CCC) -o $@ $(PROGOBJS) $(LDFLAGS) $(LIBS_DIR) $(MOTIF_LIBS) $(OS_LIBS)
 	$(MOZ_POST_PROGRAM_COMMAND) $@

-$(PROGRAM)_qt: $(PROGOBJS) $(EXTRA_DEPS) Makefile Makefile.in $(DIST)/lib/libviewer_qt_s.a
+$(PROGRAM)_qt: $(PROGOBJS) $(EXTRA_DEPS) Makefile Makefile.in unix/qt/libviewer_qt_s.a
 	$(CCC) -o $@ $(PROGOBJS) $(LDFLAGS) $(LIBS_DIR) $(QT_LIBS) $(OS_LIBS)
 	$(MOZ_POST_PROGRAM_COMMAND) $@

-$(PROGRAM)_xlib: $(PROGOBJS) $(EXTRA_DEPS) Makefile Makefile.in $(DIST)/lib/libviewer_xlib_s.a
+$(PROGRAM)_xlib: $(PROGOBJS) $(EXTRA_DEPS) Makefile Makefile.in unix/xlib/libviewer_xlib_s.a
 	$(CCC) -o $@ $(PROGOBJS) $(LDFLAGS) $(LIBS_DIR) $(XLIB_LIBS) $(OS_LIBS)
 	$(MOZ_POST_PROGRAM_COMMAND) $@

--- a/widget/src/os2/res/Makefile.in
+++ b/widget/src/os2/res/Makefile.in
@ -34,9 +34,7 @@ endif

 export:

-libs: $(DLL)
-
-install:
+install: $(DLL)
 	$(INSTALL) -m 444 $(DLL) $(DIST)/bin

 # XXX Have to copy files because rc and link386 are too stupid for a mirror tree build
--- a/xpcom/Makefile.in
+++ b/xpcom/Makefile.in
@ -29,7 +29,11 @@ include $(DEPTH)/config/autoconf.mk
 DIRS		= typelib base ds io components threads reflect proxy build tools sample

 ifdef ENABLE_TESTS
-DIRS		+= tests
+DIRS		+= \
+	typelib/xpt/tests \
+	reflect/xptinfo/tests \
+	reflect/xptcall/tests \
+	proxy/tests
 endif

 include $(topsrcdir)/config/rules.mk
--- a/xpcom/proxy/Makefile.in
+++ b/xpcom/proxy/Makefile.in
@ -24,9 +24,5 @@ include $(DEPTH)/config/autoconf.mk

 DIRS		= public src

-ifdef ENABLE_TESTS
-DIRS		+= tests
-endif
-
 include $(topsrcdir)/config/rules.mk

--- a/xpcom/reflect/xptcall/Makefile.in
+++ b/xpcom/reflect/xptcall/Makefile.in
@ -28,9 +28,5 @@ include $(DEPTH)/config/autoconf.mk

 DIRS		= public src

-ifdef ENABLE_TESTS
-DIRS		+= tests
-endif
-
 include $(topsrcdir)/config/rules.mk

--- a/xpcom/reflect/xptinfo/Makefile.in
+++ b/xpcom/reflect/xptinfo/Makefile.in
@ -28,9 +28,5 @@ include $(DEPTH)/config/autoconf.mk

 DIRS		= public src

-ifdef ENABLE_TESTS
-DIRS		+= tests
-endif
-
 include $(topsrcdir)/config/rules.mk

--- a/xpcom/typelib/xpt/Makefile.in
+++ b/xpcom/typelib/xpt/Makefile.in
@ -28,10 +28,6 @@ include $(DEPTH)/config/autoconf.mk

 DIRS		= public src

-ifdef ENABLE_TESTS
-DIRS		+= tests
-endif
-
 DIRS		+= tools

 include $(topsrcdir)/config/rules.mk
--- a/xpcom/typelib/xpt/src/Makefile.in
+++ b/xpcom/typelib/xpt/src/Makefile.in
@ -49,7 +49,7 @@ HOST_CFLAGS	+= -DEXPORT_XPT_API

 # Build libxpt early so that it'll be available to xpidl, which also
 # must be built early.
-export:: libs
+export:: install

 ifdef CROSS_COMPILE
 GARBAGE		+= libhostxpt.$(LIB_SUFFIX) $(HOSTOBJS)
--- a/xpcom/typelib/xpt/tools/Makefile.in
+++ b/xpcom/typelib/xpt/tools/Makefile.in
@ -58,5 +58,5 @@ endif
 endif

 # Build xpt_link and xpt_dump early.  (libs creates .deps used by install.)
-export:: libs install
+export:: install