diff options
| author | kitty <kitty@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2003-02-06 03:07:12 +0000 |
|---|---|---|
| committer | kitty <kitty@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2003-02-06 03:07:12 +0000 |
| commit | 84f0721f510fa990d1ccff04f350b5e849a762c6 (patch) | |
| tree | 67ce4cf2573789232300659dde77419e1614e6d6 /include | |
| parent | 397639951010eb4260a65db32e553bd85d188d23 (diff) | |
| download | ATCD-84f0721f510fa990d1ccff04f350b5e849a762c6.tar.gz | |
Wed Feb 5 20:48:47 2003 Krishnakumar B <kitty@cse.wustl.edu>
Diffstat (limited to 'include')
| -rw-r--r-- | include/makeinclude/rules.lib.GNU | 2 | ||||
| -rw-r--r-- | include/makeinclude/rules.local.GNU | 12 |
2 files changed, 11 insertions, 3 deletions
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) $@ $< |