diff options
| -rw-r--r-- | coreconf/rules.mk | 45 | ||||
| -rw-r--r-- | lib/ckfw/builtins/Makefile | 3 | ||||
| -rw-r--r-- | lib/ckfw/builtins/testlib/Makefile | 3 | ||||
| -rw-r--r-- | lib/ckfw/capi/Makefile | 3 | ||||
| -rw-r--r-- | lib/dev/Makefile | 3 | ||||
| -rw-r--r-- | lib/freebl/Makefile | 11 | ||||
| -rw-r--r-- | lib/pk11wrap/Makefile | 3 | ||||
| -rw-r--r-- | lib/softoken/Makefile | 7 |
8 files changed, 27 insertions, 51 deletions
diff --git a/coreconf/rules.mk b/coreconf/rules.mk index fbcf001e3..1bdf08145 100644 --- a/coreconf/rules.mk +++ b/coreconf/rules.mk @@ -114,6 +114,10 @@ alltags: find . -name dist -prune -o \( -name '*.[hc]' -o -name '*.cp' -o -name '*.cpp' \) -print | xargs etags -a find . -name dist -prune -o \( -name '*.[hc]' -o -name '*.cp' -o -name '*.cpp' \) -print | xargs ctags -a +.SECONDEXPANSION: +%/d: + @$(MAKE_OBJDIR) + define PROGRAM_template ifndef $(1)_OBJS @@ -128,8 +132,7 @@ ifndef $(1)_OBJS endif endif -$(1): $$($(1)_OBJS) $$(EXTRA_LIBS) - @$$(MAKE_OBJDIR) +$(1): $$($(1)_OBJS) $$(EXTRA_LIBS) | $$$$(@D)/d rm -f $$@ ifeq (,$$(filter-out _WIN%,$$(NS_USE_GCC)_$$(OS_TARGET))) $$(MKPROG) $$($(1)_OBJS) -Fe$$@ -link $$(LDFLAGS) $$(XLDFLAGS) $$(EXTRA_LIBS) $$(EXTRA_SHARED_LIBS) $$(OS_LIBS) @@ -155,8 +158,7 @@ endif get_objs: @echo $(OBJS) -$(LIBRARY): $(OBJS) - @$(MAKE_OBJDIR) +$(LIBRARY): $(OBJS) | $$(@D)/d rm -f $@ ifeq (,$(filter-out _WIN%,$(NS_USE_GCC)_$(OS_TARGET))) $(AR) $(subst /,\\,$(OBJS)) @@ -184,8 +186,7 @@ SUB_SHLOBJS = $(foreach dir,$(SHARED_LIBRARY_DIRS),$(addprefix $(dir)/,$(shell $ endif endif -$(SHARED_LIBRARY): $(OBJS) $(RES) $(MAPFILE) $(SUB_SHLOBJS) - @$(MAKE_OBJDIR) +$(SHARED_LIBRARY): $(OBJS) $(RES) $(MAPFILE) $(SUB_SHLOBJS) | $$(@D)/d rm -f $@ ifeq ($(OS_TARGET)$(OS_RELEASE), AIX4.1) echo "#!" > $(OBJDIR)/lib$(LIBRARY_NAME)_syms @@ -215,8 +216,7 @@ endif endif ifeq (,$(filter-out WIN%,$(OS_TARGET))) -$(RES): $(RESNAME) - @$(MAKE_OBJDIR) +$(RES): $(RESNAME) | $$(@D)/d # The resource compiler does not understand the -U option. ifdef NS_USE_GCC $(RC) $(filter-out -U%,$(DEFINES)) $(INCLUDES:-I%=--include-dir %) -o $@ $< @@ -226,8 +226,7 @@ endif @echo $(RES) finished endif -$(MAPFILE): $(MAPFILE_SOURCE) - @$(MAKE_OBJDIR) +$(MAPFILE): $(MAPFILE_SOURCE) | $$(@D)/d $(PROCESS_MAP_FILE) WCCFLAGS1 := $(subst /,\\,$(CFLAGS)) @@ -270,8 +269,7 @@ endif # The quotes allow absolute paths to contain spaces. core_abspath = '$(if $(findstring :,$(1)),$(1),$(if $(filter /%,$(1)),$(1),$(PWD)/$(1)))' -$(OBJDIR)/$(PROG_PREFIX)%$(OBJ_SUFFIX): %.c - @$(MAKE_OBJDIR) +$(OBJDIR)/$(PROG_PREFIX)%$(OBJ_SUFFIX): %.c | $$(@D)/d ifdef USE_NT_C_SYNTAX $(CC) -Fo$@ -c $(CSTD) $(CFLAGS) $(call core_abspath,$<) else @@ -282,7 +280,7 @@ else endif endif -$(PROG_PREFIX)%$(OBJ_SUFFIX): %.c +$(PROG_PREFIX)%$(OBJ_SUFFIX): %.c | $$(@D)/d ifdef USE_NT_C_SYNTAX $(CC) -Fo$@ -c $(CSTD) $(CFLAGS) $(call core_abspath,$<) else @@ -294,21 +292,17 @@ endif endif ifneq (,$(filter-out _WIN%,$(NS_USE_GCC)_$(OS_TARGET))) -$(OBJDIR)/$(PROG_PREFIX)%$(OBJ_SUFFIX): %.s - @$(MAKE_OBJDIR) +$(OBJDIR)/$(PROG_PREFIX)%$(OBJ_SUFFIX): %.s | $$(@D)/d $(AS) -o $@ $(ASFLAGS) -c $< endif -$(OBJDIR)/$(PROG_PREFIX)%$(OBJ_SUFFIX): %.asm - @$(MAKE_OBJDIR) +$(OBJDIR)/$(PROG_PREFIX)%$(OBJ_SUFFIX): %.asm | $$(@D)/d $(AS) -Fo$@ $(ASFLAGS) -c $< -$(OBJDIR)/$(PROG_PREFIX)%$(OBJ_SUFFIX): %.S - @$(MAKE_OBJDIR) +$(OBJDIR)/$(PROG_PREFIX)%$(OBJ_SUFFIX): %.S | $$(@D)/d $(AS) -o $@ $(ASFLAGS) -c $< -$(OBJDIR)/$(PROG_PREFIX)%: %.cpp - @$(MAKE_OBJDIR) +$(OBJDIR)/$(PROG_PREFIX)%: %.cpp | $$(@D)/d ifdef USE_NT_C_SYNTAX $(CCC) -Fo$@ -c $(CXXSTD) $(CFLAGS) $(CXXFLAGS) $(call core_abspath,$<) else @@ -321,8 +315,7 @@ endif define compile_ccc_pattern_RULE -$$(OBJDIR)/$$(PROG_PREFIX)%$$(OBJ_SUFFIX): %.$(1) - $$(MAKE_OBJDIR) +$$(OBJDIR)/$$(PROG_PREFIX)%$$(OBJ_SUFFIX): %.$(1) | $$$$(@D)/d ifdef STRICT_CPLUSPLUS_SUFFIX echo "#line 1 \"$$<\"" | cat - $$< > $$(OBJDIR)/t_$$*.cc $$(CCC) -o $$@ -c $$(CXXSTD) $$(CFLAGS) $$(CXXFLAGS) $$(OBJDIR)/t_$$*.cc @@ -367,9 +360,6 @@ endif define copy_varlist_into_dir_RULE ifdef $(2) ifneq (,$$(strip $$($(2)))) -$(3)/d: - @$$(MAKE_OBJDIR) - $(3)/%: % $$(INSTALL) -m 444 $$^ $(3) @@ -400,9 +390,6 @@ ifneq ($(BUILD_OPT),) REGDATE = $(subst \ ,, $(shell $(PERL) $(CORE_DEPTH)/$(MODULE)/scripts/now)) endif -$(TESTS_DIR)/d: - @$(MAKE_OBJDIR) - check: $(REGRESSION_SPEC) | $(TESTS_DIR)/d cd $(PLATFORM); \ ../$(SOURCE_MD_DIR)/bin/regress$(PROG_SUFFIX) specfile=../$(REGRESSION_SPEC) progress $(EXTRA_REGRESS_OPTIONS) diff --git a/lib/ckfw/builtins/Makefile b/lib/ckfw/builtins/Makefile index cb235e990..2a633d289 100644 --- a/lib/ckfw/builtins/Makefile +++ b/lib/ckfw/builtins/Makefile @@ -66,6 +66,5 @@ ifndef NSS_CERTDATA_TXT NSS_CERTDATA_TXT = certdata.txt endif -$(OBJDIR)/certdata.c: $(NSS_CERTDATA_TXT) certdata.perl - @$(MAKE_OBJDIR) +$(OBJDIR)/certdata.c: $(NSS_CERTDATA_TXT) certdata.perl | $$(@D)/d $(PERL) certdata.perl $(NSS_CERTDATA_TXT) $@ diff --git a/lib/ckfw/builtins/testlib/Makefile b/lib/ckfw/builtins/testlib/Makefile index 5f49b37a2..9eb29ddfa 100644 --- a/lib/ckfw/builtins/testlib/Makefile +++ b/lib/ckfw/builtins/testlib/Makefile @@ -70,7 +70,6 @@ ifndef NSS_CERTDATA-TESTLIB_TXT NSS_CERTDATA-TESTLIB_TXT = certdata-testlib.txt endif -$(OBJDIR)/certdata-testlib.c: $(NSS_CERTDATA-TESTLIB_TXT) - @$(MAKE_OBJDIR) +$(OBJDIR)/certdata-testlib.c: $(NSS_CERTDATA-TESTLIB_TXT) | $$(@D)/d $(PERL) ../certdata.perl $(NSS_CERTDATA-TESTLIB_TXT) $@ diff --git a/lib/ckfw/capi/Makefile b/lib/ckfw/capi/Makefile index 474d8adf4..3949d18e2 100644 --- a/lib/ckfw/capi/Makefile +++ b/lib/ckfw/capi/Makefile @@ -70,8 +70,7 @@ DSO_LDOPTS = -bM:SRE -bh:4 -bnoentry EXTRA_DSO_LDOPTS = -lc MKSHLIB = xlC $(DSO_LDOPTS) -$(SHARED_LIBRARY): $(OBJS) - @$(MAKE_OBJDIR) +$(SHARED_LIBRARY): $(OBJS) | $$(@D)/d rm -f $@ $(MKSHLIB) -o $@ $(OBJS) $(EXTRA_LIBS) $(EXTRA_DSO_LDOPTS) chmod +x $@ diff --git a/lib/dev/Makefile b/lib/dev/Makefile index dfc8e1d31..f41333402 100644 --- a/lib/dev/Makefile +++ b/lib/dev/Makefile @@ -19,8 +19,7 @@ include $(CORE_DEPTH)/coreconf/rules.mk ifeq ($(OS_TARGET)$(OS_RELEASE),AIX4.3) ifeq ($(USE_64),1) ifndef BUILD_OPT -$(OBJDIR)/ckhelper.o: ckhelper.c - @$(MAKE_OBJDIR) +$(OBJDIR)/ckhelper.o: ckhelper.c | $$(@D)/d $(CC) -o $@ -c -O2 $(CFLAGS) $< endif endif diff --git a/lib/freebl/Makefile b/lib/freebl/Makefile index bc14679c7..80a5f4395 100644 --- a/lib/freebl/Makefile +++ b/lib/freebl/Makefile @@ -624,12 +624,10 @@ $(OBJDIR)/ldvector$(OBJ_SUFFIX) $(OBJDIR)/loader$(OBJ_SUFFIX) : loader.h ifeq ($(SYSV_SPARC),1) -$(OBJDIR)/mpv_sparcv8.o $(OBJDIR)/mpv_sparcv8x.o $(OBJDIR)/montmulfv8.o : $(OBJDIR)/%.o : %.s - @$(MAKE_OBJDIR) +$(OBJDIR)/mpv_sparcv8.o $(OBJDIR)/mpv_sparcv8x.o $(OBJDIR)/montmulfv8.o : $(OBJDIR)/%.o : %.s | $$(@D)/d $(SOLARIS_AS) -o $@ $(SOLARIS_AS_FLAGS) $< -$(OBJDIR)/mpv_sparcv9.o $(OBJDIR)/montmulfv9.o : $(OBJDIR)/%.o : %.s - @$(MAKE_OBJDIR) +$(OBJDIR)/mpv_sparcv9.o $(OBJDIR)/montmulfv9.o : $(OBJDIR)/%.o : %.s | $$(@D)/d $(SOLARIS_AS) -o $@ $(SOLARIS_AS_FLAGS) $< $(OBJDIR)/mpmontg.o: mpmontg.c montmulf.h @@ -650,8 +648,6 @@ ALL_TRASH += $$($(1)_DIR) ifeq (,$$(filter $$($(1)_DIR)/d,$$(FREEBL_OBJDIRS))) FREEBL_OBJDIRS += $$($(1)_DIR)/d -$$($(1)_DIR)/d: - @$(MAKE_OBJDIR) endif release_md:: freebl_$(2) @@ -679,8 +675,7 @@ endif # FREEBL_CHILD_BUILD # ANSI C's strict aliasing rules. ifeq ($(OS_TARGET),Linux) ifneq ($(CPU_ARCH),x86) -$(OBJDIR)/$(PROG_PREFIX)desblapi$(OBJ_SUFFIX): desblapi.c - @$(MAKE_OBJDIR) +$(OBJDIR)/$(PROG_PREFIX)desblapi$(OBJ_SUFFIX): desblapi.c | $$(@D)/d ifdef NEED_ABSOLUTE_PATH $(CC) -o $@ -c $(CFLAGS) -fno-strict-aliasing $(call core_abspath,$<) else diff --git a/lib/pk11wrap/Makefile b/lib/pk11wrap/Makefile index 67b7a37e8..9d27595ca 100644 --- a/lib/pk11wrap/Makefile +++ b/lib/pk11wrap/Makefile @@ -51,8 +51,7 @@ $(OBJDIR)/pk11load$(OBJ_SUFFIX): debug_module.c ifeq ($(OS_TARGET)$(OS_RELEASE),AIX4.3) ifeq ($(USE_64),1) ifndef BUILD_OPT -$(OBJDIR)/pk11slot.o: pk11slot.c - @$(MAKE_OBJDIR) +$(OBJDIR)/pk11slot.o: pk11slot.c | $$(@D)/d $(CC) -o $@ -c -O2 $(CFLAGS) $< endif endif diff --git a/lib/softoken/Makefile b/lib/softoken/Makefile index e5fb2d449..68ad05753 100644 --- a/lib/softoken/Makefile +++ b/lib/softoken/Makefile @@ -66,11 +66,10 @@ $(SHARED_LIBRARY): $(CRYPTOLIB) ifeq ($(OS_TARGET)$(OS_RELEASE),AIX4.3) ifeq ($(USE_64),1) ifndef BUILD_OPT -$(OBJDIR)/pkcs11.o: pkcs11.c - @$(MAKE_OBJDIR) +$(OBJDIR)/pkcs11.o: pkcs11.c | $$(@D)/d $(CC) -o $@ -c -O2 $(CFLAGS) $< -$(OBJDIR)/pkcs11c.o: pkcs11c.c - @$(MAKE_OBJDIR) + +$(OBJDIR)/pkcs11c.o: pkcs11c.c | $$(@D)/d $(CC) -o $@ -c -O2 $(CFLAGS) $< endif endif |