diff options
| author | nanbor <nanbor@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 1999-10-19 05:29:57 +0000 |
|---|---|---|
| committer | nanbor <nanbor@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 1999-10-19 05:29:57 +0000 |
| commit | 45bf0856cf64fae3992caba5963ed74e17fb05dc (patch) | |
| tree | aa71c2601932b5247d28a79bbe3a839df9a6e0c0 /include/makeinclude/rules.bin.GNU | |
| parent | c22becd7f01e4133ed72164e8d4c000d9d506531 (diff) | |
| download | ATCD-45bf0856cf64fae3992caba5963ed74e17fb05dc.tar.gz | |
ChangeLogTag:Tue Oct 19 00:03:57 1999 Nanbor Wang <nanbor@cs.wustl.edu>
Diffstat (limited to 'include/makeinclude/rules.bin.GNU')
| -rw-r--r-- | include/makeinclude/rules.bin.GNU | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/include/makeinclude/rules.bin.GNU b/include/makeinclude/rules.bin.GNU index dc03ff9eaa0..1effe5512d7 100644 --- a/include/makeinclude/rules.bin.GNU +++ b/include/makeinclude/rules.bin.GNU @@ -6,16 +6,12 @@ # Requires GNU make #---------------------------------------------------------------------------- -ifndef OBJEXT - OBJEXT=o -endif # ! OBJEXT - VOBJS = \ $(subst .cpp,.$(OBJEXT),$(foreach file,$(SRC),$(VDIR)$(notdir $(file)))) ifeq ($(CHORUSLINK),true) -$(BIN): %: $(VDIR)%.o $(VOBJS) - $(LINK.cc) -o $@ $^ $(VLDLIBS) $(LDFLAGS) $(POSTLINK) +$(BIN): %: $(VDIR)%.$(OBJEXT) $(VOBJS) + $(LINK.cc) $(CC_OUTPUT_FLAG) $@ $^ $(VLDLIBS) $(LDFLAGS) $(POSTLINK) # $(MERGEDIR)/dtool/mkctors $@.xp.o > $@.ct.s # $(CXX) -c $@.ct.s # $(RM) $@.ct.s @@ -23,6 +19,6 @@ $(BIN): %: $(VDIR)%.o $(VOBJS) # $(RM) $@.xp.o # $(RM) $@.ct.o else -$(BIN): %: $(VDIR)%.o $(VOBJS) - $(LINK.cc) -o $@ $^ $(LDFLAGS) $(VLDLIBS) $(POSTLINK) +$(BIN): %: $(VDIR)%.$(OBJEXT) $(VOBJS) + $(LINK.cc) $(CC_OUTPUT_FLAG) $@ $^ $(LDFLAGS) $(VLDLIBS) $(POSTLINK) endif |