198 lines
6.4 KiB
Text
198 lines
6.4 KiB
Text
--- security/manager/ssl/src/Makefile.in.orig Mon Aug 14 19:22:52 2006
|
|
+++ security/manager/ssl/src/Makefile.in Thu Aug 31 15:17:20 2006
|
|
@@ -124,19 +124,19 @@
|
|
pipboot \
|
|
$(NULL)
|
|
|
|
-EXTRA_DEPS = $(NSS_DEP_LIBS)
|
|
|
|
DEFINES += -DNSS_ENABLE_ECC
|
|
|
|
# Use local includes because they are inserted before INCLUDES
|
|
# so that Mozilla's nss.h is used, not glibc's
|
|
-LOCAL_INCLUDES += $(NSS_CFLAGS)
|
|
+LOCAL_INCLUDES += -I%%LOCALBASE%%/include/nss/nss
|
|
|
|
EXTRA_DSO_LDOPTS += \
|
|
$(MOZ_UNICHARUTIL_LIBS) \
|
|
$(MOZ_COMPONENT_LIBS) \
|
|
$(MOZ_JS_LIBS) \
|
|
$(NSS_LIBS) \
|
|
+ $(LOCAL_INCLUDES) \
|
|
$(NULL)
|
|
|
|
include $(topsrcdir)/config/rules.mk
|
|
--- security/manager/Makefile.in.orig Mon Jun 26 18:14:34 2006
|
|
+++ security/manager/Makefile.in Mon Jul 2 06:13:12 2007
|
|
@@ -54,22 +54,13 @@
|
|
SSL3_LIB \
|
|
SOFTOKEN3_LIB \
|
|
SOFTOKEN3_CHK \
|
|
- LOADABLE_ROOT_MODULE \
|
|
HAVE_FREEBL_LIBS \
|
|
HAVE_FREEBL_LIBS_32 \
|
|
HAVE_FREEBL_LIBS_32INT64 \
|
|
HAVE_FREEBL_LIBS_64 \
|
|
$(NULL)
|
|
-
|
|
-LOADABLE_ROOT_MODULE = $(DLL_PREFIX)nssckbi$(DLL_SUFFIX)
|
|
endif
|
|
|
|
-NSS3_LIB = $(DLL_PREFIX)nss3$(DLL_SUFFIX)
|
|
-SMIME3_LIB = $(DLL_PREFIX)smime3$(DLL_SUFFIX)
|
|
-SSL3_LIB = $(DLL_PREFIX)ssl3$(DLL_SUFFIX)
|
|
-SOFTOKEN3_LIB = $(DLL_PREFIX)softokn3$(DLL_SUFFIX)
|
|
-SOFTOKEN3_CHK = $(DLL_PREFIX)softokn3.chk
|
|
-
|
|
# Default
|
|
HAVE_FREEBL_LIBS = 1
|
|
|
|
@@ -217,13 +208,6 @@
|
|
|
|
.nss.cleaned: .nss.checkout
|
|
ifndef MOZ_NATIVE_NSS
|
|
- $(MAKE) -C $(topsrcdir)/security/coreconf $(DEFAULT_GMAKE_FLAGS) clean
|
|
- $(MAKE) -C $(topsrcdir)/security/nss/lib $(DEFAULT_GMAKE_FLAGS) clean
|
|
-ifndef SKIP_CHK
|
|
- $(MAKE) -C $(topsrcdir)/security/nss/cmd/lib $(DEFAULT_GMAKE_FLAGS) clean
|
|
- $(MAKE) -C $(topsrcdir)/security/nss/cmd/shlibsign $(DEFAULT_GMAKE_FLAGS) clean
|
|
-endif
|
|
- touch $@
|
|
endif
|
|
|
|
.nss.checkout:
|
|
@@ -240,105 +224,12 @@
|
|
endif
|
|
|
|
libs::
|
|
-ifndef MOZ_NATIVE_NSS
|
|
- $(MAKE) -C $(topsrcdir)/security/coreconf $(DEFAULT_GMAKE_FLAGS)
|
|
-endif
|
|
-ifeq ($(OS_ARCH),WINNT)
|
|
- cd $(DIST)/lib; cp -f $(LIB_PREFIX)dbm$(MOZ_BITS).$(LIB_SUFFIX) $(LIB_PREFIX)dbm.$(LIB_SUFFIX)
|
|
-else
|
|
- cd $(DIST)/lib; cp -f $(LIB_PREFIX)mozdbm_s.$(LIB_SUFFIX) $(LIB_PREFIX)dbm.$(LIB_SUFFIX); $(RANLIB) $(LIB_PREFIX)dbm.$(LIB_SUFFIX)
|
|
-endif
|
|
-ifndef MOZ_NATIVE_NSS
|
|
- $(MAKE) -C $(topsrcdir)/security/nss/lib $(DEFAULT_GMAKE_FLAGS)
|
|
-ifndef SKIP_CHK
|
|
- $(MAKE) -C $(topsrcdir)/security/nss/cmd/lib $(DEFAULT_GMAKE_FLAGS)
|
|
- $(MAKE) -C $(topsrcdir)/security/nss/cmd/shlibsign $(DEFAULT_GMAKE_FLAGS)
|
|
-endif
|
|
- $(INSTALL) -m 755 $(DIST)/lib/$(LOADABLE_ROOT_MODULE) $(DIST)/bin
|
|
-ifndef SKIP_CHK
|
|
- $(INSTALL) -m 644 $(DIST)/lib/$(SOFTOKEN3_CHK) $(DIST)/bin
|
|
-endif
|
|
- $(INSTALL) -m 755 $(DIST)/lib/$(SOFTOKEN3_LIB) $(DIST)/bin
|
|
- $(INSTALL) -m 755 $(DIST)/lib/$(NSS3_LIB) $(DIST)/bin
|
|
- $(INSTALL) -m 755 $(DIST)/lib/$(SSL3_LIB) $(DIST)/bin
|
|
- $(INSTALL) -m 755 $(DIST)/lib/$(SMIME3_LIB) $(DIST)/bin
|
|
-ifdef HAVE_FREEBL_LIBS
|
|
-ifndef SKIP_CHK
|
|
- $(INSTALL) -m 644 $(DIST)/lib/$(FREEBL_CHK) $(DIST)/bin
|
|
-endif
|
|
- $(INSTALL) -m 755 $(DIST)/lib/$(FREEBL_LIB) $(DIST)/bin
|
|
-endif
|
|
-ifdef HAVE_FREEBL_LIBS_32
|
|
-ifndef SKIP_CHK
|
|
- $(INSTALL) -m 644 $(DIST)/lib/$(FREEBL_32INT_CHK) $(DIST)/bin
|
|
- $(INSTALL) -m 644 $(DIST)/lib/$(FREEBL_32FPU_CHK) $(DIST)/bin
|
|
-endif
|
|
- $(INSTALL) -m 755 $(DIST)/lib/$(FREEBL_32INT_LIB) $(DIST)/bin
|
|
- $(INSTALL) -m 755 $(DIST)/lib/$(FREEBL_32FPU_LIB) $(DIST)/bin
|
|
-endif
|
|
-ifdef HAVE_FREEBL_LIBS_32INT64
|
|
-ifndef SKIP_CHK
|
|
- $(INSTALL) -m 644 $(DIST)/lib/$(FREEBL_32INT64_CHK) $(DIST)/bin
|
|
-endif
|
|
- $(INSTALL) -m 755 $(DIST)/lib/$(FREEBL_32INT64_LIB) $(DIST)/bin
|
|
-endif
|
|
-ifdef HAVE_FREEBL_LIBS_64
|
|
-ifndef SKIP_CHK
|
|
- $(INSTALL) -m 644 $(DIST)/lib/$(FREEBL_64INT_CHK) $(DIST)/bin
|
|
- $(INSTALL) -m 644 $(DIST)/lib/$(FREEBL_64FPU_CHK) $(DIST)/bin
|
|
-endif
|
|
- $(INSTALL) -m 755 $(DIST)/lib/$(FREEBL_64INT_LIB) $(DIST)/bin
|
|
- $(INSTALL) -m 755 $(DIST)/lib/$(FREEBL_64FPU_LIB) $(DIST)/bin
|
|
-endif
|
|
-endif
|
|
- $(MAKE) -C boot $@
|
|
- $(MAKE) -C ssl $@
|
|
$(MAKE) -C locales $@
|
|
ifdef MOZ_XUL
|
|
$(MAKE) -C pki $@
|
|
endif
|
|
|
|
install::
|
|
-ifndef MOZ_NATIVE_NSS
|
|
- $(SYSINSTALL) -m 755 $(DIST)/lib/$(LOADABLE_ROOT_MODULE) $(DESTDIR)$(mozappdir)
|
|
-ifndef SKIP_CHK
|
|
- $(SYSINSTALL) -m 644 $(DIST)/lib/$(SOFTOKEN3_CHK) $(DESTDIR)$(mozappdir)
|
|
-endif
|
|
- $(SYSINSTALL) -m 755 $(DIST)/lib/$(SOFTOKEN3_LIB) $(DESTDIR)$(mozappdir)
|
|
- $(SYSINSTALL) -m 755 $(DIST)/lib/$(NSS3_LIB) $(DESTDIR)$(mozappdir)
|
|
- $(SYSINSTALL) -m 755 $(DIST)/lib/$(SSL3_LIB) $(DESTDIR)$(mozappdir)
|
|
- $(SYSINSTALL) -m 755 $(DIST)/lib/$(SMIME3_LIB) $(DESTDIR)$(mozappdir)
|
|
-ifdef HAVE_FREEBL_LIBS
|
|
-ifndef SKIP_CHK
|
|
- $(SYSINSTALL) -m 644 $(DIST)/lib/$(FREEBL_CHK) $(DESTDIR)$(mozappdir)
|
|
-endif
|
|
- $(SYSINSTALL) -m 755 $(DIST)/lib/$(FREEBL_LIB) $(DESTDIR)$(mozappdir)
|
|
-endif
|
|
-ifdef HAVE_FREEBL_LIBS_32
|
|
-ifndef SKIP_CHK
|
|
- $(SYSINSTALL) -m 644 $(DIST)/lib/$(FREEBL_32INT_CHK) $(DESTDIR)$(mozappdir)
|
|
- $(SYSINSTALL) -m 644 $(DIST)/lib/$(FREEBL_32FPU_CHK) $(DESTDIR)$(mozappdir)
|
|
-endif
|
|
- $(SYSINSTALL) -m 755 $(DIST)/lib/$(FREEBL_32INT_LIB) $(DESTDIR)$(mozappdir)
|
|
- $(SYSINSTALL) -m 755 $(DIST)/lib/$(FREEBL_32FPU_LIB) $(DESTDIR)$(mozappdir)
|
|
-endif
|
|
-ifdef HAVE_FREEBL_LIBS_32INT64
|
|
-ifndef SKIP_CHK
|
|
- $(SYSINSTALL) -m 644 $(DIST)/lib/$(FREEBL_32INT64_CHK) $(DESTDIR)$(mozappdir)
|
|
-endif
|
|
- $(SYSINSTALL) -m 755 $(DIST)/lib/$(FREEBL_32INT64_LIB) $(DESTDIR)$(mozappdir)
|
|
-endif
|
|
-ifdef HAVE_FREEBL_LIBS_64
|
|
-ifndef SKIP_CHK
|
|
- $(SYSINSTALL) -m 644 $(DIST)/lib/$(FREEBL_64INT_CHK) $(DESTDIR)$(mozappdir)
|
|
- $(SYSINSTALL) -m 644 $(DIST)/lib/$(FREEBL_64FPU_CHK) $(DESTDIR)$(mozappdir)
|
|
-endif
|
|
- $(SYSINSTALL) -m 755 $(DIST)/lib/$(FREEBL_64INT_LIB) $(DESTDIR)$(mozappdir)
|
|
- $(SYSINSTALL) -m 755 $(DIST)/lib/$(FREEBL_64FPU_LIB) $(DESTDIR)$(mozappdir)
|
|
-endif
|
|
-endif
|
|
- $(MAKE) -C boot $@
|
|
- $(MAKE) -C ssl $@
|
|
$(MAKE) -C locales $@
|
|
ifdef MOZ_XUL
|
|
$(MAKE) -C pki $@
|
|
@@ -352,12 +243,6 @@
|
|
$(MAKE) -C pki $@
|
|
endif
|
|
ifndef MOZ_NATIVE_NSS
|
|
- $(MAKE) -C $(topsrcdir)/security/coreconf $(DEFAULT_GMAKE_FLAGS) clean
|
|
- $(MAKE) -C $(topsrcdir)/security/nss/lib $(DEFAULT_GMAKE_FLAGS) clean
|
|
-ifndef SKIP_CHK
|
|
- $(MAKE) -C $(topsrcdir)/security/nss/cmd/lib $(DEFAULT_GMAKE_FLAGS) clean
|
|
- $(MAKE) -C $(topsrcdir)/security/nss/cmd/shlibsign $(DEFAULT_GMAKE_FLAGS) clean
|
|
-endif
|
|
endif
|
|
|
|
echo-requires-recursive::
|
|
--- toolkit/mozapps/update/src/updater/Makefile.in.orig Mon Jul 2 07:59:59 2007
|
|
+++ toolkit/mozapps/update/src/updater/Makefile.in Mon Jul 2 08:00:21 2007
|
|
@@ -52,11 +52,11 @@
|
|
|
|
PROGRAM = updater$(BIN_SUFFIX)
|
|
|
|
-REQUIRES = libmar libbz2
|
|
+REQUIRES = libmar
|
|
|
|
LIBS += \
|
|
$(DIST)/lib/$(LIB_PREFIX)mar.$(LIB_SUFFIX) \
|
|
- $(DIST)/lib/$(LIB_PREFIX)bz2.$(LIB_SUFFIX) \
|
|
+ %%LIB_BZ2%% \
|
|
$(NULL)
|
|
|
|
ifeq ($(OS_ARCH),WINNT)
|