Include a common makefile and share the damn rules instead of

cut-and-paste-and-hack-and-paste-and-cut-and-break the unix fes all over
the place.

cmd/xfe/Makefile

@@ -62,6 +62,7 @@ MICROLINE_LIB	= $(DIST)/lib/libXmL.a
 #
 
 include $(DEPTH)/config/config.mk
+include $(DEPTH)/cmd/unixfe/config/unixfe.mk
 
 DIRS		= \
 		  $(XFE2_DIR) \
@@ -314,7 +315,7 @@ BASIC_LIBS	= \
 		  $(DIST)/lib/lib$(LITE_PREFIX)rdf.a \
 		  $(DIST)/lib/lib$(LITE_PREFIX)xml.a \
 		  $(DIST)/lib/lib$(LITE_PREFIX)lay.a \
-		  $(DIST)/lib/libpng.a \
+		  $(XFE_PNG_LDFLAGS) \
 		  $(DIST)/lib/libmariner.a \
 		  $(DIST)/lib/libimg.a \
 		  $(DIST)/lib/libnetwork.a	\
@@ -330,9 +331,9 @@ JAVA_JMC	= $(DIST)/lib/libjmc.a	# XXX To be removed...
 endif
 
 BASIC_LIBS	+= \
-		  $(DIST)/lib/libpng.a \
+		  $(XFE_PNG_LDFLAGS) \
 		  $(JAVA_JMC) \
-		  $(DIST)/lib/libjpeg.a \
+		  $(XFE_JPEG_LDFLAGS) \
 		  $(DIST)/lib/libhook.a \
 		  $(DIST)/lib/libparse.a \
 		  $(DIST)/lib/lib$(LITE_PREFIX)pref.a \
@@ -522,12 +523,13 @@ BASIC_LIBS	+= \
 endif  # !MOZ_OJI
 endif  # !MOZ_JAVA
 
-# XXX To a DSO...
-ifdef FULL_STATIC_BUILD
-BASIC_LIBS	+= $(DIST)/lib/libzlib.a
-else
-BASIC_DSOS	+= -lzlib
-endif
+##
+## Only one of XFE_ZLIB_LDFLAGS and XFE_ZLIB_DSO_LDFLAGS will be defined.
+##
+## See unixfe.mk
+##
+BASIC_LIBS	+= $(XFE_ZLIB_LDFLAGS)
+BASIC_DSOS	+= $(XFE_ZLIB_DSO_LDFLAGS)
 
 ifndef NO_MOCHA
 # XXX To a DSO...
@@ -1298,3 +1300,5 @@ symbols:
 	@echo "RELEASES    = $(RELEASES)"
 	@echo "OS_ARCH     = $(OS_ARCH)"
 	@echo "FC_PLATFORM = $(FC_PLATFORM)"
+
+# eof

cmd/xfe/Makefile.in

@@ -67,6 +67,7 @@ MICROLINE_LIB	= $(DIST)/lib/libXmL.a
 #
 
 include $(topsrcdir)/config/config.mk
+include $(topsrcdir)/cmd/unixfe/config/unixfe.mk
 
 DIRS		= \
 		  $(XFE2_DIR) \
@@ -357,17 +358,9 @@ BASIC_LIBS_2	= \
 		  $(DIST)/lib/lib$(LITE_PREFIX)rdf.a \
 		  $(NULL)
 
-ifdef MOZ_NATIVE_JPEG
-BASIC_LIBS	+= -ljpeg
-else
-BASIC_LIBS	+= $(DIST)/lib/libjpeg.a
-endif
+BASIC_LIBS	+= $(XFE_JPEG_LDFLAGS)
 
-ifdef MOZ_NATIVE_PNG
-BASIC_LIBS	+= -lpng
-else
-BASIC_LIBS	+= $(DIST)/lib/libpng.a
-endif
+BASIC_LIBS	+= $(XFE_PNG_LDFLAGS)
 
 # jwz: link in libmime all the time.
 # but it needs to be before libnetutil, and I don't know how to do that,
@@ -549,16 +542,13 @@ BASIC_LIBS	+= \
 endif  # !MOZ_OJI
 endif  # !MOZ_JAVA
 
-ifdef MOZ_NATIVE_ZLIB
-BASIC_LIBS	+= -lz
-else
-# XXX To a DSO...
-ifdef FULL_STATIC_BUILD
-BASIC_LIBS	+= $(DIST)/lib/libzlib.a
-else
-BASIC_DSOS      += -lzlib
-endif
-endif
+##
+## Only one of XFE_ZLIB_LDFLAGS and XFE_ZLIB_DSO_LDFLAGS will be defined.
+##
+## See unixfe.mk
+##
+BASIC_LIBS	+= $(XFE_ZLIB_LDFLAGS)
+BASIC_DSOS	+= $(XFE_ZLIB_DSO_LDFLAGS)
 
 ifndef NO_MOCHA
 # XXX To a DSO...

cmd/xfe/icons/Makefile

@@ -18,6 +18,7 @@
 DEPTH		= ../../..
 
 include $(DEPTH)/config/config.mk
+include $(DEPTH)/cmd/unixfe/config/unixfe.mk
 
 MODULE		= xfeicons
 LIBRARY_NAME	= xfeicons
@@ -139,29 +140,17 @@ else
 JAVA_JMC = $(DIST)/lib/libstubsj.a
 endif
 
-ifndef NSPR20
 MKICONS_LIB	=  \
 		  $(DIST)/lib/libimg.a \
 		  $(JAVA_JMC) \
-		  $(DIST)/lib/libpng.a \
-		  $(DIST)/lib/libzlib.a \
-		  $(DIST)/lib/libnspr.a \
-		  $(DIST)/lib/libjpeg.a \
-		  $(DIST)/lib/libutil.a \
-		  $(DIST)/lib/libxp.a
-else
-MKICONS_LIB	=  \
-		  $(DIST)/lib/libimg.a \
-		  $(JAVA_JMC) \
-		  $(DIST)/lib/libpng.a \
-		  $(DIST)/lib/libzlib.a \
+		  $(XFE_PNG_LDFLAGS) \
+		  $(XFE_ZLIB_MKICONS_LDFLAGS) \
 		  $(DIST)/lib/libnspr21.a \
-		  $(DIST)/lib/libjpeg.a \
+		  $(XFE_JPEG_LDFLAGS) \
 		  $(DIST)/lib/libutil.a \
 		  $(DIST)/lib/libxp.a \
 		  $(DIST)/lib/libplc21.a \
 		  $(DIST)/lib/libxpcom.a
-endif
 
 GARBAGE		+= $(MKICONS_EXE) \
 		  $(ICONS_GEN_HDR) \
@@ -206,3 +195,6 @@ $(ICONS_GEN_SRC): icondata.h $(ICONANIMLIST) $(MKICONS_EXE) $(ICONS_GEN_HDR)
 	$(MKICONS_EXE) -no-xfe-define - < $(ICONANIMLIST) > $@.$$$$ && mv $@.$$$$ $@
 
 $(LIBRARY): $(OBJS)
+
+caca:
+	@echo $(XFE_ZLIB_MKICONS_LDFLAGS)

cmd/xfe/icons/Makefile.in

@@ -23,6 +23,7 @@ VPATH		= @srcdir@
 include $(DEPTH)/config/autoconf.mk
 
 include $(topsrcdir)/config/config.mk
+include $(topsrcdir)/cmd/unixfe/config/unixfe.mk
 
 MODULE		= xfeicons
 LIBRARY_NAME	= xfeicons
@@ -105,7 +106,7 @@ MAIL_OR_COMPOSE_ICONS = $(wildcard $(srcdir)/images/MNC*.gif \
 ifdef MOZ_MAIL_NEWS
 ICONS += $(MAIL_OR_COMPOSE_ICONS) \
 	$(wildcard $(srcdir)/images/MNTB*.gif $(srcdir)/images/MNAB*.gif) \
-    	$(addprefix $(srcdir)/, images/threadoff.gif \
+	$(addprefix $(srcdir)/, images/threadoff.gif \
 	images/threadon.gif
 	images/Desk_Address.gif \
 	images/Desk_Collabra.gif \
@@ -146,38 +147,15 @@ else
 JAVA_JMC = $(DIST)/lib/libstubsj.a
 endif
 
-ifndef NSPR20
-MKICONS_LIB	=  \
-		  $(DIST)/lib/libimg.a \
-		  $(JAVA_JMC) \
-		  $(DIST)/lib/libutil.a \
-		  $(DIST)/lib/libxp.a
-else
-MKICONS_LIB	=  \
-		  $(DIST)/lib/libimg.a \
-		  $(JAVA_JMC) \
-		  $(DIST)/lib/libutil.a \
-		  $(DIST)/lib/libxp.a \
-		  $(DIST)/lib/libxpcom.a
-endif
-
-ifdef MOZ_NATIVE_JPEG
-MKICONS_LIB	+= -ljpeg
-else
-MKICONS_LIB	+= $(DIST)/lib/libjpeg.a
-endif
-
-ifdef MOZ_NATIVE_PNG
-MKICONS_LIB	+= -lpng
-else
-MKICONS_LIB	+= $(DIST)/lib/libpng.a
-endif
-
-ifdef MOZ_NATIVE_ZLIB
-MKICONS_LIB	+= -lz
-else
-MKICONS_LIB	+= $(DIST)/lib/libzlib.a
-endif
+MKICONS_LIB	= \
+			$(DIST)/lib/libimg.a \
+			$(JAVA_JMC) \
+			$(DIST)/lib/libutil.a \
+			$(DIST)/lib/libxp.a \
+			$(DIST)/lib/libxpcom.a \
+			$(XFE_JPEG_LDFLAGS) \
+			$(XFE_PNG_LDFLAGS) \
+			$(XFE_ZLIB_MKICONS_LDFLAGS)
 
 MKICONS_EXTRA	= $(NSPR_LDFLAGS) $(NSPR_LIBS) $(OS_LIBS) -lm