Fixes to resource install for xpfe. Fixes to make MOZ_NATIVE_* work again. Thanks to Jeremy Lea <reg@shale.csir.co.za> for the diffs.

git-svn-id: svn://10.0.0.236/trunk@14392 18797224-902f-48f8-a5cc-f745e15eee43
1998-11-11 01:53:49 +00:00 · 1998-11-11 01:53:49 +00:00 · 0a35e79928
commit 0a35e79928
parent a47c9325cd
10 changed files with 114 additions and 107 deletions
--- a/mozilla/Makefile.in
+++ b/mozilla/Makefile.in
@ -28,10 +28,26 @@ DIRS =				\
  config			\
  dbm				\
  nsprpub			\
+  $(NULL)
+
+ifndef MOZ_NATIVE_JPEG
+DIRS +=				\
  jpeg				\
+  $(NULL)
+endif
+
+DIRS +=				\
  modules/libreg		\
  xpcom				\
+  $(NULL)
+
+ifndef MOZ_NATIVE_ZLIB
+DIRS +=				\
  modules/zlib			\
+  $(NULL)
+endif
+
+DIRS +=				\
  modules/libutil		\
  sun-java			\
  nav-java			\
--- a/mozilla/config/Makefile.in
+++ b/mozilla/config/Makefile.in
@ -93,7 +93,7 @@ endif

 # Artificial target to make parallel builds play nice
 $(DIST)/bin/bsdecho$(BIN_SUFFIX): $(OBJDIR)/nsinstall$(BINSUFFIX) $(OBJDIR)/bsdecho$(BINSUFFIX)
-	$(INSTALL) -m 444 $@ $(DIST)/bin
+	$(INSTALL) -m 444 $^ $(DIST)/bin

 $(OBJDIR)/gtscc$(BIN_SUFFIX):	$(OBJDIR)/gtscc.o
 	@$(MAKE_OBJDIR)
--- a/mozilla/config/autoconf.mk.in
+++ b/mozilla/config/autoconf.mk.in
@ -72,12 +72,36 @@ ACZIP		= @ZIP@
 OBJDIR_TAG	= _AC
 OBJDIR_NAME	= .

+ifdef MOZ_NATIVE_JPEG
 JPEG_CFLAGS	= @JPEG_CFLAGS@
 JPEG_LIBS	= @JPEG_LIBS@
+JPEG_REQUIRES	=
+else
+JPEG_CFLAGS	= -I$(DIST)/public/jpeg
+JPEG_LIBS	= $(DIST)/lib/libjpeg.a
+JPEG_REQUIRES	= jpeg
+endif
+
+ifdef MOZ_NATIVE_ZLIB
 ZLIB_CFLAGS	= @ZLIB_CFLAGS@
 ZLIB_LIBS	= @ZLIB_LIBS@
+ZLIB_REQUIRES	=
+else
+ZLIB_CFLAGS	= -I$(DIST)/public/zlib
+ZLIB_LIBS	= $(DIST)/lib/libzlib.a
+ZLIB_REQUIRES	= zlib
+endif
+
+ifdef MOZ_NATIVE_ZLIB
 PNG_CFLAGS	= @PNG_CFLAGS@
 PNG_LIBS	= @PNG_LIBS@
+PNG_REQUIRES	=
+else
+PNG_CFLAGS	= -I$(DIST)/public/png
+PNG_LIBS	= $(DIST)/lib/libpng.a
+PNG_REQUIRES	= png
+endif
+
 NSPR_CFLAGS	= @NSPR_CFLAGS@
 NSPR_LIBS	= @NSPR_LIBS@

--- a/mozilla/layout/html/base/src/Makefile.in
+++ b/mozilla/layout/html/base/src/Makefile.in
@ -80,4 +80,4 @@ MKSHLIB :=
 include $(topsrcdir)/config/rules.mk

 install::
-	$(INSTALL) broken-image.gif $(DIST)/bin/res/html
+	$(INSTALL) $(srcdir)/broken-image.gif $(DIST)/bin/res/html
--- a/mozilla/layout/html/document/src/Makefile.in
+++ b/mozilla/layout/html/document/src/Makefile.in
@ -70,7 +70,7 @@ include $(topsrcdir)/config/rules.mk
 export::

 install:: $(TARGETS)
-	$(INSTALL) ua.css $(DIST)/bin/res
+	$(INSTALL) $(srcdir)/ua.css $(DIST)/bin/res


 clobber::
--- a/mozilla/modules/libimg/src/Makefile.in
+++ b/mozilla/modules/libimg/src/Makefile.in
@ -28,10 +28,11 @@ include $(DEPTH)/config/autoconf.mk
 MODULE		= img
 LIBRARY_NAME	= img

-ifdef STANDALONE_IMAGE_LIB
+REQUIRES	= $(JPEG_REQUIRES) $(PNG_REQUIRES) $(ZLIB_REQUIRES)
+LOCAL_INCLUDES	= -I$(srcdir) $(PNG_CFLAGS) $(ZLIB_CFLAGS)
+EXTRA_LIBS	= $(PNG_LIBS) $(ZLIB_LIBS)

 CPPSRCS		= ilNetReader.cpp \
-		  xpcompat.cpp \
 		  color.cpp \
 		  colormap.cpp \
 		  dither.cpp \
@ -46,71 +47,21 @@ CPPSRCS		= ilNetReader.cpp \
 		  png_png.cpp \
 		  $(NULL)

-EXPORTS		= PIMGCB.h PPSIMGCB.h
+ifdef STANDALONE_IMAGE_LIB

-REQUIRES	= zlib jpeg util img png xpcom
-
-ifdef NU_CACHE
-REQUIRES 	+= cache
-endif
-
-LOCAL_INCLUDES	= -I$(srcdir)/../png -I$(srcdir) -I$(DEPTH)/dist/public/zlib
-
-EXTRA_LIBS	= $(DIST)/lib/libzlib.a $(DIST)/lib/libpng.a $(DIST)/lib/libnspr21.a $(dist)/lib/libjpeg.a $(DIST)/lib/libplc21.a $(DIST)/lib/libutil.a
-
-symbols::
-	@echo "LIBRARY_NAME     is $(LIBRARY_NAME)"
-	@echo "LIBRARY          is $(LIBRARY)"
-	@echo  "DIST		is $(DIST)"
-
-else
-CPPSRCS		= color.cpp \
-		  colormap.cpp \
-		  dither.cpp \
-		  dummy_nc.cpp \
-		  external.cpp \
-		  gif.cpp \
-		  if.cpp \
-		  ilclient.cpp \
-		  il_util.cpp \
-		  jpeg.cpp \
-		  scale.cpp \
-		  xbm.cpp \
-		  ipng.cpp \
-		  png_png.cpp \
-		  ilNetReader.cpp \
+CPPSRCS		+= xpcompat.cpp \
 		  $(NULL)

-EXPORTS		= PIMGCB.h PPSIMGCB.h
+REQUIRES	+= util img xpcom

-REQUIRES	= jtools java dbm util img layer js xpcom
+EXTRA_LIBS	+= $(NSPR_LIBS)

-ifdef NU_CACHE
-REQUIRES 	+= cache
-endif
-
-LOCAL_INCLUDES	= -I$(srcdir)
-EXTRA_LIBS	= 
-
-ifndef MOZ_NATIVE_JPEG
-REQUIRES	+= jpeg
-endif
-
-ifdef MOZ_NATIVE_PNG
-EXTRA_LIBS	+= -lpng
 else
-REQUIRES	+= png
-LOCAL_INCLUDES	+= -I$(srcdir)/../png
-EXTRA_LIBS	+= $(DIST)/lib/libpng.a
-endif
+CPPSRCS		+= dummy_nc.cpp \
+		  external.cpp \
+		  $(NULL)

-ifdef MOZ_NATIVE_ZLIB
-EXTRA_LIBS	+= -lz
-else
-REQUIRES	+= zlib
-LOCAL_INCLUDES	+= -I$(DEPTH)/dist/public/zlib
-EXTRA_LIBS 	+= $(DIST)/lib/libzlib.a
-endif
+REQUIRES	+= jtools java dbm util img layer js xpcom

 #
 # Generate MIMGCB.c (and similar sources) here.
@ -120,8 +71,19 @@ JMC_GEN		= MIMGCB MPSIMGCB
 JMC_GEN_FLAGS	= -cimpl -noexc -module
 endif

+EXPORTS		= PIMGCB.h PPSIMGCB.h
+
+ifdef NU_CACHE
+REQUIRES 	+= cache
+endif
+
 EXPORTS := $(addprefix $(srcdir)/, $(EXPORTS))

+symbols::
+	@echo "LIBRARY_NAME     is $(LIBRARY_NAME)"
+	@echo "LIBRARY          is $(LIBRARY)"
+	@echo  "DIST		is $(DIST)"
+
 include $(topsrcdir)/config/rules.mk

 #
--- a/mozilla/network/module/Makefile.in
+++ b/mozilla/network/module/Makefile.in
@ -66,15 +66,15 @@ $(LIBRARY): \
 	$(OBJS)

 install::
-	$(INSTALL) res/gopher-audio.gif   $(DIST)/bin/res/network
-	$(INSTALL) res/gopher-binary.gif  $(DIST)/bin/res/network
-	$(INSTALL) res/gopher-find.gif    $(DIST)/bin/res/network
-	$(INSTALL) res/gopher-image.gif   $(DIST)/bin/res/network
-	$(INSTALL) res/gopher-menu.gif    $(DIST)/bin/res/network
-	$(INSTALL) res/gopher-movie.gif   $(DIST)/bin/res/network
-	$(INSTALL) res/gopher-telnet.gif  $(DIST)/bin/res/network
-	$(INSTALL) res/gopher-text.gif    $(DIST)/bin/res/network
-	$(INSTALL) res/gopher-unknown.gif $(DIST)/bin/res/network
+	$(INSTALL) $(srcdir)/res/gopher-audio.gif   $(DIST)/bin/res/network
+	$(INSTALL) $(srcdir)/res/gopher-binary.gif  $(DIST)/bin/res/network
+	$(INSTALL) $(srcdir)/res/gopher-find.gif    $(DIST)/bin/res/network
+	$(INSTALL) $(srcdir)/res/gopher-image.gif   $(DIST)/bin/res/network
+	$(INSTALL) $(srcdir)/res/gopher-menu.gif    $(DIST)/bin/res/network
+	$(INSTALL) $(srcdir)/res/gopher-movie.gif   $(DIST)/bin/res/network
+	$(INSTALL) $(srcdir)/res/gopher-telnet.gif  $(DIST)/bin/res/network
+	$(INSTALL) $(srcdir)/res/gopher-text.gif    $(DIST)/bin/res/network
+	$(INSTALL) $(srcdir)/res/gopher-unknown.gif $(DIST)/bin/res/network

 clobber::
 	rm -f $(DIST)/bin/res/network/gopher-audio.gif
--- a/mozilla/webshell/tests/viewer/Makefile.in
+++ b/mozilla/webshell/tests/viewer/Makefile.in
@ -88,7 +88,7 @@ endif
 EX_LIBS = \
 	-L$(DIST)/bin \
 	-lraptorbase    \
-	-lpng \
+	$(PNG_LIBS) \
 	-lpref \
 	-lraptorbase \
 	$(TOOLKIT_WIDGET_LIB) \
@ -106,7 +106,7 @@ EX_LIBS = \
 	-lgophurl \
 	-lhttpurl \
 	-limg \
-	-ljpeg \
+	$(JPEG_LIBS) \
 	-ljs \
 	-ljsdom \
 	$(DIST)/lib/libjsdomcore_s.a \
@ -128,15 +128,14 @@ EX_LIBS = \
 	-lutil \
 	-lxp \
 	-lxpcom \
-	-lzlib \
 	-lutil \
 	-lxp \
 	-lxpcom \
-	-lzlib \
+	$(ZLIB_LIBS) \
 	-lraptorplugin \
 	$(NULL)

-ifneq (,$(filter Linux SunOS,$(OS_ARCH)))
+ifneq (,$(filter FreeBSD Linux SunOS,$(OS_ARCH)))
 EX_LIBS += \
 	-lpwcac \
 	-ldbm \
--- a/mozilla/widget/tests/scribble/Makefile.in
+++ b/mozilla/widget/tests/scribble/Makefile.in
@ -75,7 +75,7 @@ OBJS	= $(CPPSRCS:.cpp=.o)
 EX_LIBS = \
 	-L$(DIST)/bin \
 	-lraptorbase    \
-	-lpng \
+	$(PNG_LIBS) \
 	-lpref \
 	-lraptorbase \
 	$(TOOLKIT_WIDGET_LIB) \
@ -93,7 +93,7 @@ EX_LIBS = \
 	-lgophurl \
 	-lhttpurl \
 	-limg \
-	-ljpeg \
+	$(JPEG_LIBS) \
 	-ljs \
 	-ljsdom \
 	$(DIST)/lib/libjsdomcore_s.a \
@ -114,15 +114,14 @@ EX_LIBS = \
 	-lutil \
 	-lxp \
 	-lxpcom \
-	-lzlib \
 	-lutil \
 	-lxp \
 	-lxpcom \
-	-lzlib \
+	$(ZLIB_LIBS) \
 	-lraptorplugin \
 	$(NULL)

-ifneq (,$(filter Linux SunOS,$(OS_ARCH)))
+ifneq (,$(filter FreeBSD Linux SunOS,$(OS_ARCH)))
 EX_LIBS += \
 	-lpwcac \
 	-ldbm \
@ -140,7 +139,11 @@ $(PROGS): $(OBJS) # $(EX_LIBS)
 ifeq ($(OS_ARCH),Linux)
 	$(CCC) -rdynamic -o $@ $(OBJS) $(LDFLAGS) $(EX_LIBS) $(NSPR_LIBS) $(TOOLKIT_LIBS) $(OS_LIBS)
 else
+ifeq ($(OS_ARCH),IRIX)
 	$(CCC) -o $@ -woff 84,85 $(LDFLAGS) $(OBJS) $(EX_LIBS) $(NSPR_LIBS) $(TOOLKIT_LIBS) $(OS_LIBS)
+else
+	$(CCC) -o $@ $(LDFLAGS) $(OBJS) $(EX_LIBS) $(NSPR_LIBS) $(TOOLKIT_LIBS) $(OS_LIBS)
+endif
 endif

 #$(OBJDIR)/Scribble.o::	Scribble.cpp
--- a/mozilla/xpfe/xpviewer/src/Makefile.in
+++ b/mozilla/xpfe/xpviewer/src/Makefile.in
@ -86,7 +86,7 @@ OBJS	= $(CPPSRCS:.cpp=.o)
 EX_LIBS = \
 	-L$(DIST)/bin \
 	-lraptorbase    \
-	-lpng \
+	$(PNG_LIBS) \
 	-lpref \
 	-lraptorbase \
 	$(TOOLKIT_WIDGET_LIB) \
@ -104,7 +104,7 @@ EX_LIBS = \
 	-lgophurl \
 	-lhttpurl \
 	-limg \
-	-ljpeg \
+	$(JPEG_LIBS) \
 	-ljs \
 	-ljsdom \
 	$(DIST)/lib/libjsdomcore_s.a \
@ -125,15 +125,14 @@ EX_LIBS = \
 	-lutil \
 	-lxp \
 	-lxpcom \
-	-lzlib \
 	-lutil \
 	-lxp \
 	-lxpcom \
-	-lzlib \
+	$(ZLIB_LIBS) \
 	-lraptorplugin \
 	$(NULL)

-ifneq (,$(filter Linux SunOS,$(OS_ARCH)))
+ifneq (,$(filter FreeBSD Linux SunOS,$(OS_ARCH)))
 EX_LIBS += \
 	-lpwcac \
 	-ldbm \
@ -151,33 +150,37 @@ $(PROGS): $(OBJS) # $(EX_LIBS)
 ifeq ($(OS_ARCH),Linux)
 	$(CCC) -rdynamic -o $@ $(OBJS) $(LDFLAGS) $(EX_LIBS) $(NSPR_LIBS) $(TOOLKIT_LIBS) $(OS_LIBS)
 else
+ifeq ($(OS_ARCH),IRIX)
 	$(CCC) -o $@ -woff 84,85 $(LDFLAGS) $(OBJS) $(EX_LIBS) $(NSPR_LIBS) $(TOOLKIT_LIBS) $(OS_LIBS)
+else
+	$(CCC) -o $@ $(LDFLAGS) $(OBJS) $(EX_LIBS) $(NSPR_LIBS) $(TOOLKIT_LIBS) $(OS_LIBS)
+endif
 endif

 export::

 install:: $(TARGETS)
 	$(INSTALL) $(PROGS) $(DIST)/bin
-	$(INSTALL) $(srcdir)/samples/test0.html $(DIST)/bin/res/samples
-	$(INSTALL) $(srcdir)/samples/test1.html $(DIST)/bin/res/samples
-	$(INSTALL) $(srcdir)/samples/test2.html $(DIST)/bin/res/samples
-	$(INSTALL) $(srcdir)/samples/test3.html $(DIST)/bin/res/samples
-	$(INSTALL) $(srcdir)/samples/test4.html $(DIST)/bin/res/samples
-	$(INSTALL) $(srcdir)/samples/test5.html $(DIST)/bin/res/samples
-	$(INSTALL) $(srcdir)/samples/test6.html $(DIST)/bin/res/samples
-	$(INSTALL) $(srcdir)/samples/test7.html $(DIST)/bin/res/samples
-	$(INSTALL) $(srcdir)/samples/test8.html $(DIST)/bin/res/samples
-	$(INSTALL) $(srcdir)/samples/test8siz.html $(DIST)/bin/res/samples
-	$(INSTALL) $(srcdir)/samples/test8sca.html $(DIST)/bin/res/samples
-	$(INSTALL) $(srcdir)/samples/test8tab.html $(DIST)/bin/res/samples
-	$(INSTALL) $(srcdir)/samples/test9.html $(DIST)/bin/res/samples
-	$(INSTALL) $(srcdir)/samples/test9a.html $(DIST)/bin/res/samples
-	$(INSTALL) $(srcdir)/samples/test9b.html $(DIST)/bin/res/samples
-	$(INSTALL) $(srcdir)/samples/raptor.jpg $(DIST)/bin/res/samples
-	$(INSTALL) $(srcdir)/samples/Anieyes.gif $(DIST)/bin/res/samples
-	$(INSTALL) $(srcdir)/samples/gear1.gif $(DIST)/bin/res/samples
-	$(INSTALL) $(srcdir)/samples/rock_gra.gif $(DIST)/bin/res/samples
-	$(INSTALL) $(srcdir)/samples/bg.jpg $(DIST)/bin/res/samples
+	$(INSTALL) $(srcdir)/../../../webshell/tests/viewer/samples/test0.html $(DIST)/bin/res/samples
+	$(INSTALL) $(srcdir)/../../../webshell/tests/viewer/samples/test1.html $(DIST)/bin/res/samples
+	$(INSTALL) $(srcdir)/../../../webshell/tests/viewer/samples/test2.html $(DIST)/bin/res/samples
+	$(INSTALL) $(srcdir)/../../../webshell/tests/viewer/samples/test3.html $(DIST)/bin/res/samples
+	$(INSTALL) $(srcdir)/../../../webshell/tests/viewer/samples/test4.html $(DIST)/bin/res/samples
+	$(INSTALL) $(srcdir)/../../../webshell/tests/viewer/samples/test5.html $(DIST)/bin/res/samples
+	$(INSTALL) $(srcdir)/../../../webshell/tests/viewer/samples/test6.html $(DIST)/bin/res/samples
+	$(INSTALL) $(srcdir)/../../../webshell/tests/viewer/samples/test7.html $(DIST)/bin/res/samples
+	$(INSTALL) $(srcdir)/../../../webshell/tests/viewer/samples/test8.html $(DIST)/bin/res/samples
+	$(INSTALL) $(srcdir)/../../../webshell/tests/viewer/samples/test8siz.html $(DIST)/bin/res/samples
+	$(INSTALL) $(srcdir)/../../../webshell/tests/viewer/samples/test8sca.html $(DIST)/bin/res/samples
+	$(INSTALL) $(srcdir)/../../../webshell/tests/viewer/samples/test8tab.html $(DIST)/bin/res/samples
+	$(INSTALL) $(srcdir)/../../../webshell/tests/viewer/samples/test9.html $(DIST)/bin/res/samples
+	$(INSTALL) $(srcdir)/../../../webshell/tests/viewer/samples/test9a.html $(DIST)/bin/res/samples
+	$(INSTALL) $(srcdir)/../../../webshell/tests/viewer/samples/test9b.html $(DIST)/bin/res/samples
+	$(INSTALL) $(srcdir)/../../../webshell/tests/viewer/samples/raptor.jpg $(DIST)/bin/res/samples
+	$(INSTALL) $(srcdir)/../../../webshell/tests/viewer/samples/Anieyes.gif $(DIST)/bin/res/samples
+	$(INSTALL) $(srcdir)/../../../webshell/tests/viewer/samples/gear1.gif $(DIST)/bin/res/samples
+	$(INSTALL) $(srcdir)/../../../webshell/tests/viewer/samples/rock_gra.gif $(DIST)/bin/res/samples
+	$(INSTALL) $(srcdir)/../../../webshell/tests/viewer/samples/bg.jpg $(DIST)/bin/res/samples
 	$(INSTALL) $(srcdir)/resources/throbber/LargeAnimation00.gif $(DIST)/bin/res/throbber
 	$(INSTALL) $(srcdir)/resources/throbber/LargeAnimation01.gif $(DIST)/bin/res/throbber
 	$(INSTALL) $(srcdir)/resources/throbber/LargeAnimation02.gif $(DIST)/bin/res/throbber