diff options
| author | dhinton <dhinton@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2003-12-26 18:29:45 +0000 |
|---|---|---|
| committer | dhinton <dhinton@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2003-12-26 18:29:45 +0000 |
| commit | 58ddaf53ff10e877afa846f2e83117730c72e2f5 (patch) | |
| tree | 670fad6114ae0bc5b07ff449c2b486b41464b4d4 /include/makeinclude | |
| parent | 277347067cd2b0b5e0c4b3987e6d33cae6f46a81 (diff) | |
| download | ATCD-58ddaf53ff10e877afa846f2e83117730c72e2f5.tar.gz | |
ChangeLogTag:Fri Dec 26 18:22:07 UTC 2003 Don Hinton <dhinton@dresystems.com>
Diffstat (limited to 'include/makeinclude')
| -rw-r--r-- | include/makeinclude/all_in_one.GNU | 6 | ||||
| -rw-r--r-- | include/makeinclude/rules.lib.GNU | 2 | ||||
| -rw-r--r-- | include/makeinclude/rules.local.GNU | 14 |
3 files changed, 8 insertions, 14 deletions
diff --git a/include/makeinclude/all_in_one.GNU b/include/makeinclude/all_in_one.GNU index 649e2e7d03b..cf0da1f537a 100644 --- a/include/makeinclude/all_in_one.GNU +++ b/include/makeinclude/all_in_one.GNU @@ -57,11 +57,11 @@ ifdef DIRS else # !DIRS include $(ACE_ROOT)/include/makeinclude/rules.nonested.GNU endif # DIRS -ifdef LIB +ifdef CLEANUP_LIB include_lib = 1 endif # LIB -ifdef SHLIB +ifdef CLEANUP_SHLIB include_lib = 1 endif # SHLIB @@ -69,7 +69,7 @@ ifeq ($(include_lib),1) include $(ACE_ROOT)/include/makeinclude/rules.lib.GNU endif -ifdef BIN +ifdef CLEANUP_BIN include $(ACE_ROOT)/include/makeinclude/rules.bin.GNU endif # BIN diff --git a/include/makeinclude/rules.lib.GNU b/include/makeinclude/rules.lib.GNU index 4c7a8fb20ee..bc398003d14 100644 --- a/include/makeinclude/rules.lib.GNU +++ b/include/makeinclude/rules.lib.GNU @@ -94,7 +94,7 @@ endif # static_libs ifdef shared_libs LIB_INSTALL += $(VSHLIB:%=$(INSLIB)/%) CLEANUP_INSTALL += $(CLEANUP_VSHLIB:%=$(INSLIB)/%) - CLEANUP_INSTALL += $(CLEANUP_VSHLIB_NO_VER:%=$(INSLIB)/%) + CLEANUP_INSTALL += $(CLEANUP_VSHLIB_NO_VER:%=$(INSLIB)/%*) ifdef SHLIBA LIB_INSTALL += $(VSHLIBA:%=$(INSLIB)/%) CLEANUP_INSTALL += $(CLEANUP_SHLIBA:%=$(INSLIB)/%) diff --git a/include/makeinclude/rules.local.GNU b/include/makeinclude/rules.local.GNU index c5e422b4042..fa6eadd84fc 100644 --- a/include/makeinclude/rules.local.GNU +++ b/include/makeinclude/rules.local.GNU @@ -293,18 +293,14 @@ ifdef IDL_FILES -$(RM) $(foreach ext, $(IDL_EXT), $(addsuffix $(ext), $(IDL_FILES))) endif -ifdef CLEANUP_BIN - CLEANUP_BIN ?= -endif # CLEANUP_BIN +CLEANUP_BIN ?= ifneq ($(CLEANUP_BIN),) DO_CLEANUP = 1 REALCLEAN_FILES = $(CLEANUP_BIN:%=%$(EXEEXT)) $(CLEANUP_BIN:%=%_debug$(EXEEXT)) $(CLEANUP_BIN:%=%_profile$(EXEEXT)) $(CLEANUP_BIN:%=%_optimize$(EXEEXT)) endif # !CLEANUP_BIN ifdef static_libs - ifdef CLEANUP_LIB - CLEANUP_LIB ?= - endif # CLEANUP_LIB + CLEANUP_LIB ?= ifneq ($(CLEANUP_LIB),) DO_CLEANUP = 1 REALCLEAN_FILES += $(CLEANUP_LIB:%=%) $(CLEANUP_LIB:%=%_debug) $(CLEANUP_LIB:%=%_profile) $(CLEANUP_LIB:%=%_optimize) @@ -312,12 +308,10 @@ ifdef static_libs endif # static_libs ifdef shared_libs - ifdef CLEANUP_SHLIB - CLEANUP_SHLIB ?= - endif + CLEANUP_SHLIB ?= ifneq ($(CLEANUP_SHLIB),) DO_CLEANUP = 1 - REALCLEAN_FILES += $(CLEANUP_VSHLIB:%=%) $(CLEANUP_VSHLIB_NO_VER:%=%) $(CLEANUP_VSHLIB_NO_VER:%=%_debug) $(CLEANUP_VSHLIB_NO_VER:%=%_profile) $(CLEANUP_VSHLIB_NO_VER:%=%_optimize) + REALCLEAN_FILES += $(CLEANUP_VSHLIB:%=%) $(CLEANUP_VSHLIB_NO_VER:%=%*) $(CLEANUP_VSHLIB_NO_VER:%=%_debug) $(CLEANUP_VSHLIB_NO_VER:%=%_profile) $(CLEANUP_VSHLIB_NO_VER:%=%_optimize) endif # !CLEANUP_SHLIB endif # shared_libs |