diff options
| author | brunsch <brunsch@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2000-05-14 19:49:48 +0000 |
|---|---|---|
| committer | brunsch <brunsch@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2000-05-14 19:49:48 +0000 |
| commit | 7b72f26ca3c61d0e4eb650a15fbcf0502f7bc7c2 (patch) | |
| tree | d9af6eef48b3d3d225b6f91f99d8c3c4ecc75586 /include | |
| parent | eece330e961d5c7463ede8e7a384ce7dd26cf4e5 (diff) | |
| download | ATCD-7b72f26ca3c61d0e4eb650a15fbcf0502f7bc7c2.tar.gz | |
ChangeLogTag:Sun May 14 12:43:35 2000 Darrell Brunsch <brunsch@uci.edu>
Diffstat (limited to 'include')
| -rw-r--r-- | include/makeinclude/ace_flags.bor | 2 | ||||
| -rw-r--r-- | include/makeinclude/recurse.bor | 12 |
2 files changed, 7 insertions, 7 deletions
diff --git a/include/makeinclude/ace_flags.bor b/include/makeinclude/ace_flags.bor index 6380c92eb42..69522354058 100644 --- a/include/makeinclude/ace_flags.bor +++ b/include/makeinclude/ace_flags.bor @@ -12,7 +12,7 @@ DLL_FLAG=1 # # Compiler flags # -ACE_CFLAGS = -I$(ACE_ROOT) -DACE_HAS_DLL=$(DLL_FLAG) -DACE_BUILD_DLL +ACE_CFLAGS = -I$(ACE_ROOT) -DACE_HAS_DLL=$(DLL_FLAG) TAO_CFLAGS = -I$(ACE_ROOT)\TAO -DTAO_HAS_DLL=$(DLL_FLAG) TAO_SVC_UTILS_CFLAGS = -I$(ACE_ROOT)\TAO\orbsvcs -DTAO_SVC_UTILS_HAS_DLL=$(DLL_FLAG) TAO_AV_CFLAGS = -I$(ACE_ROOT)\TAO\orbsvcs -DTAO_AV_HAS_DLL=$(DLL_FLAG) diff --git a/include/makeinclude/recurse.bor b/include/makeinclude/recurse.bor index 77c878e6ab7..0ba6f4443cc 100644 --- a/include/makeinclude/recurse.bor +++ b/include/makeinclude/recurse.bor @@ -17,10 +17,10 @@ all: $(DIRS) # automatically restored when the sub-directory is finished. $(DIRS): @echo Entering directory $< - @$(MAKE) $(MAKE_FLAGS) -f&&! + @$(MAKE) -$(MAKEFLAGS) $(MAKE_FLAGS) -f&&! all: @cd $< - $(MAKE) $(MAKE_FLAGS) -fMakefile.bor + $(MAKE) -$(MAKEFLAGS) $(MAKE_FLAGS) -fMakefile.bor ! # This ugliness is to remove extra spaces from between the items in the list. @@ -36,10 +36,10 @@ clean: $(DIRS_CLEAN) # automatically restored when the sub-directory is finished. $(DIRS_CLEAN): @echo Cleaning directory $(<:.Clean=) - @$(MAKE) $(MAKE_FLAGS) -f&&! + @$(MAKE) -$(MAKEFLAGS) $(MAKE_FLAGS) -f&&! all: @cd $(<:.Clean=) - $(MAKE) $(MAKE_FLAGS) -fMakefile.bor clean + $(MAKE) -$(MAKEFLAGS) $(MAKE_FLAGS) -fMakefile.bor clean ! !endif @@ -56,7 +56,7 @@ MAKEFILES_ALL = $(MAKEFILES_ALL_4:%=.All ) all: $(MAKEFILES_ALL) $(MAKEFILES_ALL): - $(MAKE) $(MAKE_FLAGS) -f$(<:.All=) + $(MAKE) -$(MAKEFLAGS) $(MAKE_FLAGS) -f$(<:.All=) # This ugliness is to remove extra spaces from between the items in the list. MAKEFILES_CLEAN_1 = $(MAKEFILES) $(BLANK_SPACE) @@ -68,6 +68,6 @@ MAKEFILES_CLEAN = $(MAKEFILES_CLEAN_4:%=.Clean ) clean: $(MAKEFILES_CLEAN) $(MAKEFILES_CLEAN): - $(MAKE) $(MAKE_FLAGS) -f$(<:.Clean=) clean + $(MAKE) -$(MAKEFLAGS) $(MAKE_FLAGS) -f$(<:.Clean=) clean !endif |