diff options
| author | joeh <joeh@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2000-06-16 21:00:33 +0000 |
|---|---|---|
| committer | joeh <joeh@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2000-06-16 21:00:33 +0000 |
| commit | 04090e933cc1a64fb2b8a3866aba810dfe11d1e2 (patch) | |
| tree | d6413074ed87178f12f112763b3b6a59f88881b5 | |
| parent | 2e8bb07aa27c0a768104b2a03b3a40e90e2c37d9 (diff) | |
| download | ATCD-04090e933cc1a64fb2b8a3866aba810dfe11d1e2.tar.gz | |
Moving VLDLIBS definition from wrapper_macros.GNU to rules.bin.GNU to
allow unsetting ACE_LIB. Needed for PACE Makefile.
| -rw-r--r-- | include/makeinclude/rules.bin.GNU | 2 | ||||
| -rw-r--r-- | include/makeinclude/wrapper_macros.GNU | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/include/makeinclude/rules.bin.GNU b/include/makeinclude/rules.bin.GNU index 1e74a53d39b..ad6c1c02220 100644 --- a/include/makeinclude/rules.bin.GNU +++ b/include/makeinclude/rules.bin.GNU @@ -9,6 +9,8 @@ VOBJS = \ $(subst .cpp,.$(OBJEXT),$(foreach file,$(SRC),$(VDIR)$(notdir $(file)))) +VLDLIBS := $(LDLIBS) $(ACELIB) $(LIBS) + ifeq ($(CHORUSLINK),true) $(BIN): %: $(VDIR)%.$(OBJEXT) $(VOBJS) $(LINK.cc) $(CC_OUTPUT_FLAG) $@ $^ $(VLDLIBS) $(LDFLAGS) $(POSTLINK) diff --git a/include/makeinclude/wrapper_macros.GNU b/include/makeinclude/wrapper_macros.GNU index 4b914878933..8aa0dd5c3f7 100644 --- a/include/makeinclude/wrapper_macros.GNU +++ b/include/makeinclude/wrapper_macros.GNU @@ -490,8 +490,6 @@ else # ! shared_libs endif # ! static_libs endif # ! shared_libs -VLDLIBS := $(LDLIBS) $(ACELIB) $(LIBS) - ifeq ($(probe),0) override probe = endif # probe |