diff options
| -rw-r--r-- | ChangeLog | 24 | ||||
| -rw-r--r-- | ChangeLogs/ChangeLog-03a | 24 | ||||
| -rw-r--r-- | include/makeinclude/rules.lib.GNU | 2 | ||||
| -rw-r--r-- | include/makeinclude/rules.local.GNU | 12 |
4 files changed, 47 insertions, 15 deletions
diff --git a/ChangeLog b/ChangeLog index 2b1f735492a..f23b1412f4b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,15 @@ +Wed Feb 5 20:48:47 2003 Krishnakumar B <kitty@cse.wustl.edu> + + * include/makeinclude/rules.local.GNU: Added rules to generate + object files from C++ file extensions .cxx, .C and .cc, in + addition to .cpp. + +Wed Feb 5 20:15:18 2003 Krishnakumar B <kitty@cse.wustl.edu> + + * include/makeinclude/rules.lib.GNU: Removed the conditional + setting of VSHOBJS and VSHOBJS1 based on PRELIB. There is too + much bogosity here. This should fix HP-UX and AIX breakage. + Sat Feb 1 08:43:53 2003 Douglas C. Schmidt <schmidt@macarena.cs.wustl.edu> * ace/Stream_Modules.cpp (put): Return 0 rather than -1 to be consistent @@ -77,17 +89,17 @@ Sat Feb 1 07:50 2003 Douglas C. Schmidt <schmidt@macarena.cs.wustl.edu> * Our deepest sympathies to the families and friends of the crew of the US Space Shuttle Columbia, which was lost over Texas this - morning. - + morning. + "We shall never forget them nor the last time we saw them, as they prepared for their mission and waved good-bye and slipped the surly bonds of Earth to touch the face of God." - + - President Reagan (addressing NASA employees following the - tragic loss of the Challenger 7 crew on STS-51L.) - + tragic loss of the Challenger 7 crew on STS-51L.) + Ad astra per aspera. - + Sat Feb 1 09:00:00 2003 Steve Huston <shuston@riverace.com> * Space Shuttle Columbia breaks up at 200,000ft altitude at diff --git a/ChangeLogs/ChangeLog-03a b/ChangeLogs/ChangeLog-03a index 2b1f735492a..f23b1412f4b 100644 --- a/ChangeLogs/ChangeLog-03a +++ b/ChangeLogs/ChangeLog-03a @@ -1,3 +1,15 @@ +Wed Feb 5 20:48:47 2003 Krishnakumar B <kitty@cse.wustl.edu> + + * include/makeinclude/rules.local.GNU: Added rules to generate + object files from C++ file extensions .cxx, .C and .cc, in + addition to .cpp. + +Wed Feb 5 20:15:18 2003 Krishnakumar B <kitty@cse.wustl.edu> + + * include/makeinclude/rules.lib.GNU: Removed the conditional + setting of VSHOBJS and VSHOBJS1 based on PRELIB. There is too + much bogosity here. This should fix HP-UX and AIX breakage. + Sat Feb 1 08:43:53 2003 Douglas C. Schmidt <schmidt@macarena.cs.wustl.edu> * ace/Stream_Modules.cpp (put): Return 0 rather than -1 to be consistent @@ -77,17 +89,17 @@ Sat Feb 1 07:50 2003 Douglas C. Schmidt <schmidt@macarena.cs.wustl.edu> * Our deepest sympathies to the families and friends of the crew of the US Space Shuttle Columbia, which was lost over Texas this - morning. - + morning. + "We shall never forget them nor the last time we saw them, as they prepared for their mission and waved good-bye and slipped the surly bonds of Earth to touch the face of God." - + - President Reagan (addressing NASA employees following the - tragic loss of the Challenger 7 crew on STS-51L.) - + tragic loss of the Challenger 7 crew on STS-51L.) + Ad astra per aspera. - + Sat Feb 1 09:00:00 2003 Steve Huston <shuston@riverace.com> * Space Shuttle Columbia breaks up at 200,000ft altitude at diff --git a/include/makeinclude/rules.lib.GNU b/include/makeinclude/rules.lib.GNU index d7fe373170a..96f8d1d2167 100644 --- a/include/makeinclude/rules.lib.GNU +++ b/include/makeinclude/rules.lib.GNU @@ -19,10 +19,8 @@ VLOBJS += $(addsuffix .$(OBJEXT),$(addprefix $(VDIR),$(basename $(notdir $(LSR LSRC += $(LSRC2) -ifdef PRELIB VSHOBJS = $(addsuffix .$(OBJEXT),$(addprefix $(VSHDIR),$(basename $(notdir $(LSRC))))) VSHOBJS1 = $(addsuffix .$(OBJEXT),$(addprefix $(VSHDIR),$(basename $(notdir $(LSRC))))) -endif # ! PRELIB ifdef static_libs INSTALL += $(VLIB:%.$(LIBEXT)=$(INSLIB)/%.$(LIBEXT)) diff --git a/include/makeinclude/rules.local.GNU b/include/makeinclude/rules.local.GNU index 7d78844043a..3336dcafecd 100644 --- a/include/makeinclude/rules.local.GNU +++ b/include/makeinclude/rules.local.GNU @@ -22,7 +22,7 @@ build.local: $(BUILD) # Set up the suffixes for C++ and IDL. .SUFFIXES: -.SUFFIXES: .cpp .cc .C .idl $(SUFFIXES) +.SUFFIXES: .cpp .cc .C .cxx .idl $(SUFFIXES) # C++ related targets @@ -52,6 +52,10 @@ $(VDIR)%.o: %.cc $(VDIR).creation_stamp $(COMPILE.cc) $(CC_OUTPUT_FLAG) $@ $< ${MVCMD} +$(VDIR)%.o: %.cxx $(VDIR).creation_stamp + $(COMPILE.cc) $(CC_OUTPUT_FLAG) $@ $< + ${MVCMD} + # If SOLINK is defined, then the .$(SOEXT) file is built from the # .$(OBJEXT) file via separate rules in the same directory. # Otherwise, the .$(SOEXT) and .$(OBJEXT) are built via the same rule. @@ -82,6 +86,12 @@ endif $(VSHDIR)%.$(OBJEXT): %.cc $(VSHDIR).creation_stamp $(COMPILE.cc) $(PIC) $(CC_OUTPUT_FLAG) $@ $< +$(VSHDIR)%.$(OBJEXT): %.C $(VSHDIR).creation_stamp + $(COMPILE.cc) $(PIC) $(CC_OUTPUT_FLAG) $@ $< + +$(VSHDIR)%.$(OBJEXT): %.cxx $(VSHDIR).creation_stamp + $(COMPILE.cc) $(PIC) $(CC_OUTPUT_FLAG) $@ $< + $(VSHDIR)%.$(OBJEXT): %.c $(VSHDIR).creation_stamp $(COMPILE.c) $(PIC) $(CC_OUTPUT_FLAG) $@ $< |