diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2012-06-22 16:05:26 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2012-06-25 14:19:00 +0100 |
| commit | 403bdf77473afaea60b80d212af19b8a1c08b876 (patch) | |
| tree | cd218649d2e58db51357392230df3e57ea2cf5cc /moz | |
| parent | 2b2e7aa7dfb3b41a2f0068a058bf7567465b87d2 (diff) | |
NSS_INCLUDE_LIST is always empty, so simplify based on that
Change-Id: I0b3fe5a6270ecc45ec1b4710ea008a17c600484b
Diffstat (limited to 'moz')
| -rw-r--r-- | moz/extractfiles.mk | 8 | ||||
| -rw-r--r-- | moz/zipped/makefile.mk | 9 |
2 files changed, 0 insertions, 17 deletions
diff --git a/moz/extractfiles.mk b/moz/extractfiles.mk index 6035d5f4e2eb..7f309be69c52 100644 --- a/moz/extractfiles.mk +++ b/moz/extractfiles.mk @@ -170,8 +170,6 @@ DEFAULTS_RUNTIMELIST= \ greprefs$/security-prefs.js .IF "$(SYSTEM_NSS)"=="NO" -#These headers come from the separate NSS module if enabled -NSS_INCLUDE_LIST= .IF "$(GUI)"=="WNT" .IF "$(COM)"=="GCC" @@ -412,12 +410,6 @@ $(MISC)$/build$/so_moz_include_files: $(INCCOM)$/nsBuildID.h chmod -R 775 $(INCCOM) .ENDIF $(TOUCH) $@ -.IF "$(SYSTEM_NSS)"=="NO" - +$(foreach,dir,$(NSS_INCLUDE_LIST) $(RENAME:s/+//) $(INCLUDE_DIR)$/$(dir) $(INCLUDE_DIR)$/$(dir)_remove_me &&) echo >& $(NULLDEV) - $(foreach,dir,$(NSS_INCLUDE_LIST) rm -rf $(INCLUDE_DIR)$/$(dir)_remove_me &&) echo >& $(NULLDEV) - -$(MKDIR) $(OUT)$/inc.nss - cd $(OUT)$/inc.nss && $(foreach,dir,$(NSS_INCLUDE_LIST) $(GNUCOPY) -pRL $(SOLARINCDIR)$/mozilla/$(dir) . &&) echo >& $(NULLDEV) -.ENDIF # On UNX the rules for so_moz_runtime_files copy files into the same directory # used here (LIB_DIR), and on MACOSX all those files together need to be diff --git a/moz/zipped/makefile.mk b/moz/zipped/makefile.mk index a08561e1c86c..f401982798c2 100644 --- a/moz/zipped/makefile.mk +++ b/moz/zipped/makefile.mk @@ -95,7 +95,6 @@ $(BIN)$/mozruntime%zip : $(OS)$(COM)UBruntime.zip LIBLIST = BIN_RUNTIMELIST = -NSS_INCLUDE_LIST = NSS_MODULE_RUNTIME_LIST = # The prebuilt moz files include all the old NSS stuff from moz and not the new @@ -153,10 +152,6 @@ LIBLIST= \ .ENDIF # .IF "$(GUI)"=="WNT" - -NSS_INCLUDE_LIST= - - .IF "$(OS)" == "SOLARIS" .IF "$(CPU)" == "S" #32bit FREEBL=freebl_32fpu_3 freebl_32int64_3 freebl_32int_3 @@ -194,10 +189,6 @@ NSS_MODULE_RUNTIME_LIST += sqlite/sqlite3 # Remove the nss libs build in moz and those build in the nss module $(MISC)$/replace_old_nss_libs : $(MISC)$/unpacked_$(TARGET)_lib \ $(MISC)$/unpacked_$(TARGET)_inc $(BIN)$/mozruntime.zip - +$(foreach,dir,$(NSS_INCLUDE_LIST) $(RENAME:s/+//) $(INCCOM)$/$(dir) \ - $(INCCOM)$/$(dir)_remove_me &&) echo >& $(NULLDEV) - $(foreach,dir,$(NSS_INCLUDE_LIST) rm -r -f $(INCCOM)$/$(dir)_remove_me &&) \ - echo >& $(NULLDEV) $(foreach,lib,$(LIBLIST) rm -f $(LB)$/$(lib) &&) \ echo >& $(NULLDEV) $(foreach,lib,$(BIN_RUNTIMELIST) zip -d $(BIN)$/mozruntime.zip $(DLLPRE)$(lib:f)$(DLLPOST) &&) \ |