From 22ec122467ce47cd6aabc4b40eee15156fbd0a83 Mon Sep 17 00:00:00 2001 From: "wtchang%redhat.com" Date: Fri, 16 Sep 2005 17:09:23 +0000 Subject: [PATCH] Bugzilla Bug 303508: enhanced the makefile rule for $(MAPFILE). Added the new variable MAPFILE_SOURCE instead of the hardcoded $(LIBRARY_NAME).def to represent the "source" mapfile, and use $< to refer to the "source" mapfile (prerequisite of the target) in PROCESS_MAP_FILE. r=nelsonb. Modified Files: AIX.mk BSD_OS.mk Darwin.mk FreeBSD.mk HP-UX.mk IRIX.mk Linux.mk Linux2.1.mk Linux2.2.mk Linux2.4.mk Linux2.5.mk Linux2.6.mk NCR3.0.mk NEC4.2.mk NetBSD.mk OS2.mk OSF1.mk OpenUNIX.mk OpenVMS.mk ReliantUNIX.mk SCO_SV3.2.mk SunOS5.mk UNIXWARE2.1.mk WIN16.mk WIN32.mk WINCE.mk rules.mk ruleset.mk git-svn-id: svn://10.0.0.236/trunk@180406 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/security/coreconf/AIX.mk | 2 +- mozilla/security/coreconf/BSD_OS.mk | 2 +- mozilla/security/coreconf/Darwin.mk | 2 +- mozilla/security/coreconf/FreeBSD.mk | 2 +- mozilla/security/coreconf/HP-UX.mk | 2 +- mozilla/security/coreconf/IRIX.mk | 2 +- mozilla/security/coreconf/Linux.mk | 2 +- mozilla/security/coreconf/Linux2.1.mk | 2 +- mozilla/security/coreconf/Linux2.2.mk | 2 +- mozilla/security/coreconf/Linux2.4.mk | 2 +- mozilla/security/coreconf/Linux2.5.mk | 2 +- mozilla/security/coreconf/Linux2.6.mk | 2 +- mozilla/security/coreconf/NCR3.0.mk | 2 +- mozilla/security/coreconf/NEC4.2.mk | 2 +- mozilla/security/coreconf/NetBSD.mk | 2 +- mozilla/security/coreconf/OS2.mk | 4 ++-- mozilla/security/coreconf/OSF1.mk | 2 +- mozilla/security/coreconf/OpenUNIX.mk | 2 +- mozilla/security/coreconf/OpenVMS.mk | 2 +- mozilla/security/coreconf/ReliantUNIX.mk | 2 +- mozilla/security/coreconf/SCO_SV3.2.mk | 2 +- mozilla/security/coreconf/SunOS5.mk | 2 +- mozilla/security/coreconf/UNIXWARE2.1.mk | 2 +- mozilla/security/coreconf/WIN16.mk | 2 +- mozilla/security/coreconf/WIN32.mk | 2 +- mozilla/security/coreconf/WINCE.mk | 2 +- mozilla/security/coreconf/rules.mk | 2 +- mozilla/security/coreconf/ruleset.mk | 3 +++ 28 files changed, 31 insertions(+), 28 deletions(-) diff --git a/mozilla/security/coreconf/AIX.mk b/mozilla/security/coreconf/AIX.mk index b0841b6958b..255be17b410 100644 --- a/mozilla/security/coreconf/AIX.mk +++ b/mozilla/security/coreconf/AIX.mk @@ -84,7 +84,7 @@ else DSO_LDOPTS += -bexpall endif -PROCESS_MAP_FILE = grep -v ';+' $(LIBRARY_NAME).def | grep -v ';-' | \ +PROCESS_MAP_FILE = grep -v ';+' $< | grep -v ';-' | \ sed -e 's; DATA ;;' -e 's,;;,,' -e 's,;.*,,' > $@ ifdef BUILD_OPT diff --git a/mozilla/security/coreconf/BSD_OS.mk b/mozilla/security/coreconf/BSD_OS.mk index 8b9fe68b717..e9492c11bcd 100644 --- a/mozilla/security/coreconf/BSD_OS.mk +++ b/mozilla/security/coreconf/BSD_OS.mk @@ -84,7 +84,7 @@ ifdef MAPFILE # Add LD options to restrict exported symbols to those in the map file endif # Change PROCESS to put the mapfile in the correct format for this platform -PROCESS_MAP_FILE = cp $(LIBRARY_NAME).def $@ +PROCESS_MAP_FILE = cp $< $@ G++INCLUDES = -I/usr/include/g++ diff --git a/mozilla/security/coreconf/Darwin.mk b/mozilla/security/coreconf/Darwin.mk index 7a90bde3574..278d43f2ae5 100644 --- a/mozilla/security/coreconf/Darwin.mk +++ b/mozilla/security/coreconf/Darwin.mk @@ -104,7 +104,7 @@ DSO_LDOPTS = -dynamiclib -compatibility_version 1 -current_version 1 -install_na MKSHLIB = $(CC) -arch $(CPU_ARCH) $(DSO_LDOPTS) DLL_SUFFIX = dylib -PROCESS_MAP_FILE = grep -v ';+' $(LIBRARY_NAME).def | grep -v ';-' | \ +PROCESS_MAP_FILE = grep -v ';+' $< | grep -v ';-' | \ sed -e 's; DATA ;;' -e 's,;;,,' -e 's,;.*,,' -e 's,^,_,' > $@ G++INCLUDES = -I/usr/include/g++ diff --git a/mozilla/security/coreconf/FreeBSD.mk b/mozilla/security/coreconf/FreeBSD.mk index d8cf2dec1ff..a187399620e 100644 --- a/mozilla/security/coreconf/FreeBSD.mk +++ b/mozilla/security/coreconf/FreeBSD.mk @@ -78,7 +78,7 @@ ifdef MAPFILE # Add LD options to restrict exported symbols to those in the map file endif # Change PROCESS to put the mapfile in the correct format for this platform -PROCESS_MAP_FILE = cp $(LIBRARY_NAME).def $@ +PROCESS_MAP_FILE = cp $< $@ G++INCLUDES = -I/usr/include/g++ diff --git a/mozilla/security/coreconf/HP-UX.mk b/mozilla/security/coreconf/HP-UX.mk index a16eab8d969..61ae030e99f 100644 --- a/mozilla/security/coreconf/HP-UX.mk +++ b/mozilla/security/coreconf/HP-UX.mk @@ -71,7 +71,7 @@ MKSHLIB = $(LD) $(DSO_LDOPTS) ifdef MAPFILE MKSHLIB += -c $(MAPFILE) endif -PROCESS_MAP_FILE = grep -v ';+' $(LIBRARY_NAME).def | grep -v ';-' | \ +PROCESS_MAP_FILE = grep -v ';+' $< | grep -v ';-' | \ sed -e 's; DATA ;;' -e 's,;;,,' -e 's,;.*,,' -e 's,^,+e ,' > $@ DSO_LDOPTS = -b +h $(notdir $@) diff --git a/mozilla/security/coreconf/IRIX.mk b/mozilla/security/coreconf/IRIX.mk index 48882feb65e..9d7cd89920d 100644 --- a/mozilla/security/coreconf/IRIX.mk +++ b/mozilla/security/coreconf/IRIX.mk @@ -107,7 +107,7 @@ ifdef MAPFILE # Add LD options to restrict exported symbols to those in the map file endif # Change PROCESS to put the mapfile in the correct format for this platform -PROCESS_MAP_FILE = cp $(LIBRARY_NAME).def $@ +PROCESS_MAP_FILE = cp $< $@ DSO_LDOPTS = -elf -shared -all diff --git a/mozilla/security/coreconf/Linux.mk b/mozilla/security/coreconf/Linux.mk index 1601d2606e5..3a7b25fe812 100644 --- a/mozilla/security/coreconf/Linux.mk +++ b/mozilla/security/coreconf/Linux.mk @@ -143,7 +143,7 @@ ifeq ($(OS_RELEASE),2.0) ifdef MAPFILE MKSHLIB += -Wl,--version-script,$(MAPFILE) endif - PROCESS_MAP_FILE = grep -v ';-' $(LIBRARY_NAME).def | \ + PROCESS_MAP_FILE = grep -v ';-' $< | \ sed -e 's,;+,,' -e 's; DATA ;;' -e 's,;;,,' -e 's,;.*,;,' > $@ endif diff --git a/mozilla/security/coreconf/Linux2.1.mk b/mozilla/security/coreconf/Linux2.1.mk index eaba97ab6f7..7569e1b1004 100644 --- a/mozilla/security/coreconf/Linux2.1.mk +++ b/mozilla/security/coreconf/Linux2.1.mk @@ -42,7 +42,7 @@ ifeq ($(OS_RELEASE),2.1) ifdef MAPFILE MKSHLIB += -Wl,--version-script,$(MAPFILE) endif - PROCESS_MAP_FILE = grep -v ';-' $(LIBRARY_NAME).def | \ + PROCESS_MAP_FILE = grep -v ';-' $< | \ sed -e 's,;+,,' -e 's; DATA ;;' -e 's,;;,,' -e 's,;.*,;,' > $@ endif diff --git a/mozilla/security/coreconf/Linux2.2.mk b/mozilla/security/coreconf/Linux2.2.mk index bcbddb8f88b..86bffef75fe 100644 --- a/mozilla/security/coreconf/Linux2.2.mk +++ b/mozilla/security/coreconf/Linux2.2.mk @@ -43,6 +43,6 @@ MKSHLIB = $(CC) $(DSO_LDOPTS) -Wl,-soname -Wl,$(@:$(OBJDIR)/%.so=%.so) ifdef MAPFILE MKSHLIB += -Wl,--version-script,$(MAPFILE) endif -PROCESS_MAP_FILE = grep -v ';-' $(LIBRARY_NAME).def | \ +PROCESS_MAP_FILE = grep -v ';-' $< | \ sed -e 's,;+,,' -e 's; DATA ;;' -e 's,;;,,' -e 's,;.*,;,' > $@ diff --git a/mozilla/security/coreconf/Linux2.4.mk b/mozilla/security/coreconf/Linux2.4.mk index bcbddb8f88b..86bffef75fe 100644 --- a/mozilla/security/coreconf/Linux2.4.mk +++ b/mozilla/security/coreconf/Linux2.4.mk @@ -43,6 +43,6 @@ MKSHLIB = $(CC) $(DSO_LDOPTS) -Wl,-soname -Wl,$(@:$(OBJDIR)/%.so=%.so) ifdef MAPFILE MKSHLIB += -Wl,--version-script,$(MAPFILE) endif -PROCESS_MAP_FILE = grep -v ';-' $(LIBRARY_NAME).def | \ +PROCESS_MAP_FILE = grep -v ';-' $< | \ sed -e 's,;+,,' -e 's; DATA ;;' -e 's,;;,,' -e 's,;.*,;,' > $@ diff --git a/mozilla/security/coreconf/Linux2.5.mk b/mozilla/security/coreconf/Linux2.5.mk index bcbddb8f88b..86bffef75fe 100644 --- a/mozilla/security/coreconf/Linux2.5.mk +++ b/mozilla/security/coreconf/Linux2.5.mk @@ -43,6 +43,6 @@ MKSHLIB = $(CC) $(DSO_LDOPTS) -Wl,-soname -Wl,$(@:$(OBJDIR)/%.so=%.so) ifdef MAPFILE MKSHLIB += -Wl,--version-script,$(MAPFILE) endif -PROCESS_MAP_FILE = grep -v ';-' $(LIBRARY_NAME).def | \ +PROCESS_MAP_FILE = grep -v ';-' $< | \ sed -e 's,;+,,' -e 's; DATA ;;' -e 's,;;,,' -e 's,;.*,;,' > $@ diff --git a/mozilla/security/coreconf/Linux2.6.mk b/mozilla/security/coreconf/Linux2.6.mk index bcbddb8f88b..86bffef75fe 100644 --- a/mozilla/security/coreconf/Linux2.6.mk +++ b/mozilla/security/coreconf/Linux2.6.mk @@ -43,6 +43,6 @@ MKSHLIB = $(CC) $(DSO_LDOPTS) -Wl,-soname -Wl,$(@:$(OBJDIR)/%.so=%.so) ifdef MAPFILE MKSHLIB += -Wl,--version-script,$(MAPFILE) endif -PROCESS_MAP_FILE = grep -v ';-' $(LIBRARY_NAME).def | \ +PROCESS_MAP_FILE = grep -v ';-' $< | \ sed -e 's,;+,,' -e 's; DATA ;;' -e 's,;;,,' -e 's,;.*,;,' > $@ diff --git a/mozilla/security/coreconf/NCR3.0.mk b/mozilla/security/coreconf/NCR3.0.mk index e624e34d78c..5be97e1ef2c 100644 --- a/mozilla/security/coreconf/NCR3.0.mk +++ b/mozilla/security/coreconf/NCR3.0.mk @@ -72,7 +72,7 @@ ifdef MAPFILE # Add LD options to restrict exported symbols to those in the map file endif # Change PROCESS to put the mapfile in the correct format for this platform -PROCESS_MAP_FILE = cp $(LIBRARY_NAME).def $@ +PROCESS_MAP_FILE = cp $< $@ CPU_ARCH = x86 ARCH = ncr diff --git a/mozilla/security/coreconf/NEC4.2.mk b/mozilla/security/coreconf/NEC4.2.mk index e7ed4fba1a7..71d7187a940 100644 --- a/mozilla/security/coreconf/NEC4.2.mk +++ b/mozilla/security/coreconf/NEC4.2.mk @@ -55,7 +55,7 @@ ifdef MAPFILE # Add LD options to restrict exported symbols to those in the map file endif # Change PROCESS to put the mapfile in the correct format for this platform -PROCESS_MAP_FILE = cp $(LIBRARY_NAME).def $@ +PROCESS_MAP_FILE = cp $< $@ RANLIB = /bin/true diff --git a/mozilla/security/coreconf/NetBSD.mk b/mozilla/security/coreconf/NetBSD.mk index 18a8523085b..3f2900150ed 100644 --- a/mozilla/security/coreconf/NetBSD.mk +++ b/mozilla/security/coreconf/NetBSD.mk @@ -80,7 +80,7 @@ ifdef MAPFILE # Add LD options to restrict exported symbols to those in the map file endif # Change PROCESS to put the mapfile in the correct format for this platform -PROCESS_MAP_FILE = cp $(LIBRARY_NAME).def $@ +PROCESS_MAP_FILE = cp $< $@ G++INCLUDES = -I/usr/include/g++ diff --git a/mozilla/security/coreconf/OS2.mk b/mozilla/security/coreconf/OS2.mk index aa72dada4c9..d68488b4b1c 100644 --- a/mozilla/security/coreconf/OS2.mk +++ b/mozilla/security/coreconf/OS2.mk @@ -101,7 +101,7 @@ PROCESS_MAP_FILE = \ echo CODE LOADONCALL MOVEABLE DISCARDABLE >> $@; \ echo DATA PRELOAD MOVEABLE MULTIPLE NONSHARED >> $@; \ echo EXPORTS >> $@; \ - grep -v ';+' $(LIBRARY_NAME).def | grep -v ';-' | \ + grep -v ';+' $< | grep -v ';-' | \ sed -e 's; DATA ;;' -e 's,;;,,' -e 's,;.*,,' -e 's,\([\t ]*\),\1_,' | \ awk 'BEGIN {ord=1;} { print($$0 " @" ord " RESIDENTNAME"); ord++;}' >> $@ @@ -168,7 +168,7 @@ PROCESS_MAP_FILE = \ echo CODE LOADONCALL MOVEABLE DISCARDABLE >> $@; \ echo DATA PRELOAD MOVEABLE MULTIPLE NONSHARED >> $@; \ echo EXPORTS >> $@; \ - grep -v ';+' $(LIBRARY_NAME).def | grep -v ';-' | \ + grep -v ';+' $< | grep -v ';-' | \ sed -e 's; DATA ;;' -e 's,;;,,' -e 's,;.*,,' >> $@ endif #NO_SHARED_LIB diff --git a/mozilla/security/coreconf/OSF1.mk b/mozilla/security/coreconf/OSF1.mk index bdcfb09b6de..93c09de77e5 100644 --- a/mozilla/security/coreconf/OSF1.mk +++ b/mozilla/security/coreconf/OSF1.mk @@ -68,7 +68,7 @@ MKSHLIB += ld -shared -expect_unresolved "*" -soname $(notdir $@) ifdef MAPFILE MKSHLIB += -hidden -input $(MAPFILE) endif -PROCESS_MAP_FILE = grep -v ';+' $(LIBRARY_NAME).def | grep -v ';-' | \ +PROCESS_MAP_FILE = grep -v ';+' $< | grep -v ';-' | \ sed -e 's; DATA ;;' -e 's,;;,,' -e 's,;.*,,' -e 's,^,-exported_symbol ,' > $@ DSO_LDOPTS += -shared diff --git a/mozilla/security/coreconf/OpenUNIX.mk b/mozilla/security/coreconf/OpenUNIX.mk index 8a0f9b4bfea..5a38181eaf9 100644 --- a/mozilla/security/coreconf/OpenUNIX.mk +++ b/mozilla/security/coreconf/OpenUNIX.mk @@ -79,7 +79,7 @@ ifdef MAPFILE # Add LD options to restrict exported symbols to those in the map file endif # Change PROCESS to put the mapfile in the correct format for this platform -PROCESS_MAP_FILE = cp $(LIBRARY_NAME).def $@ +PROCESS_MAP_FILE = cp $< $@ # # These defines are for building unix plugins diff --git a/mozilla/security/coreconf/OpenVMS.mk b/mozilla/security/coreconf/OpenVMS.mk index e5c6a3fef2f..6d9b0168b1a 100755 --- a/mozilla/security/coreconf/OpenVMS.mk +++ b/mozilla/security/coreconf/OpenVMS.mk @@ -66,7 +66,7 @@ ifdef MAPFILE # Add LD options to restrict exported symbols to those in the map file endif # Change PROCESS to put the mapfile in the correct format for this platform -PROCESS_MAP_FILE = cp $(LIBRARY_NAME).def $@ +PROCESS_MAP_FILE = cp $< $@ # diff --git a/mozilla/security/coreconf/ReliantUNIX.mk b/mozilla/security/coreconf/ReliantUNIX.mk index c118aeb5e96..cdf71ed087e 100644 --- a/mozilla/security/coreconf/ReliantUNIX.mk +++ b/mozilla/security/coreconf/ReliantUNIX.mk @@ -71,7 +71,7 @@ ifdef MAPFILE # Add LD options to restrict exported symbols to those in the map file endif # Change PROCESS to put the mapfile in the correct format for this platform -PROCESS_MAP_FILE = cp $(LIBRARY_NAME).def $@ +PROCESS_MAP_FILE = cp $< $@ NOSUCHFILE = /sni-rm-f-sucks ODD_CFLAGS += -DSVR4 -DSNI -DRELIANTUNIX diff --git a/mozilla/security/coreconf/SCO_SV3.2.mk b/mozilla/security/coreconf/SCO_SV3.2.mk index 075389dcc1c..db9bec6a922 100644 --- a/mozilla/security/coreconf/SCO_SV3.2.mk +++ b/mozilla/security/coreconf/SCO_SV3.2.mk @@ -79,7 +79,7 @@ ifdef MAPFILE # Add LD options to restrict exported symbols to those in the map file endif # Change PROCESS to put the mapfile in the correct format for this platform -PROCESS_MAP_FILE = cp $(LIBRARY_NAME).def $@ +PROCESS_MAP_FILE = cp $< $@ # # These defines are for building unix plugins diff --git a/mozilla/security/coreconf/SunOS5.mk b/mozilla/security/coreconf/SunOS5.mk index 8ff0f775318..fff1d1a3b9a 100644 --- a/mozilla/security/coreconf/SunOS5.mk +++ b/mozilla/security/coreconf/SunOS5.mk @@ -150,7 +150,7 @@ else MKSHLIB += -M $(MAPFILE) endif endif -PROCESS_MAP_FILE = grep -v ';-' $(LIBRARY_NAME).def | \ +PROCESS_MAP_FILE = grep -v ';-' $< | \ sed -e 's,;+,,' -e 's; DATA ;;' -e 's,;;,,' -e 's,;.*,;,' > $@ diff --git a/mozilla/security/coreconf/UNIXWARE2.1.mk b/mozilla/security/coreconf/UNIXWARE2.1.mk index e0a9ef90127..7edcb1f5819 100644 --- a/mozilla/security/coreconf/UNIXWARE2.1.mk +++ b/mozilla/security/coreconf/UNIXWARE2.1.mk @@ -57,5 +57,5 @@ ifdef MAPFILE # Add LD options to restrict exported symbols to those in the map file endif # Change PROCESS to put the mapfile in the correct format for this platform -PROCESS_MAP_FILE = cp $(LIBRARY_NAME).def $@ +PROCESS_MAP_FILE = cp $< $@ diff --git a/mozilla/security/coreconf/WIN16.mk b/mozilla/security/coreconf/WIN16.mk index 9c1eefb291f..e5d4b18163f 100644 --- a/mozilla/security/coreconf/WIN16.mk +++ b/mozilla/security/coreconf/WIN16.mk @@ -117,7 +117,7 @@ ifdef MAPFILE # Add LD options to restrict exported symbols to those in the map file endif # Change PROCESS to put the mapfile in the correct format for this platform -PROCESS_MAP_FILE = copy $(LIBRARY_NAME).def $@ +PROCESS_MAP_FILE = copy $< $@ # diff --git a/mozilla/security/coreconf/WIN32.mk b/mozilla/security/coreconf/WIN32.mk index 10e046888b1..42310541418 100644 --- a/mozilla/security/coreconf/WIN32.mk +++ b/mozilla/security/coreconf/WIN32.mk @@ -157,7 +157,7 @@ DLLFLAGS += -DEF:$(MAPFILE) endif endif # Change PROCESS to put the mapfile in the correct format for this platform -PROCESS_MAP_FILE = cp $(LIBRARY_NAME).def $@ +PROCESS_MAP_FILE = cp $< $@ # diff --git a/mozilla/security/coreconf/WINCE.mk b/mozilla/security/coreconf/WINCE.mk index 39d73c92fbd..86d8686745d 100644 --- a/mozilla/security/coreconf/WINCE.mk +++ b/mozilla/security/coreconf/WINCE.mk @@ -111,7 +111,7 @@ ifdef MAPFILE endif # Change PROCESS to put the mapfile in the correct format for this platform -PROCESS_MAP_FILE = cp $(LIBRARY_NAME).def $@ +PROCESS_MAP_FILE = cp $< $@ # # The following is NOT needed for the NSPR 2.0 library. diff --git a/mozilla/security/coreconf/rules.mk b/mozilla/security/coreconf/rules.mk index e454fc7fed9..054e70b2e5a 100644 --- a/mozilla/security/coreconf/rules.mk +++ b/mozilla/security/coreconf/rules.mk @@ -373,7 +373,7 @@ endif @echo $(RES) finished endif -$(MAPFILE): $(LIBRARY_NAME).def +$(MAPFILE): $(MAPFILE_SOURCE) @$(MAKE_OBJDIR) $(PROCESS_MAP_FILE) diff --git a/mozilla/security/coreconf/ruleset.mk b/mozilla/security/coreconf/ruleset.mk index f4969ee5df2..5ee77a78a7f 100644 --- a/mozilla/security/coreconf/ruleset.mk +++ b/mozilla/security/coreconf/ruleset.mk @@ -123,6 +123,9 @@ ifdef LIBRARY_NAME ifndef SHARED_LIBRARY SHARED_LIBRARY = $(OBJDIR)/$(DLL_PREFIX)$(LIBRARY_NAME)$(LIBRARY_VERSION)$(JDK_DEBUG_SUFFIX).$(DLL_SUFFIX) endif + ifndef MAPFILE_SOURCE + MAPFILE_SOURCE = $(LIBRARY_NAME).def + endif endif #