diff options
| author | Johnny Willemsen <jwillemsen@remedy.nl> | 2008-03-06 16:50:00 +0000 |
|---|---|---|
| committer | Johnny Willemsen <jwillemsen@remedy.nl> | 2008-03-06 16:50:00 +0000 |
| commit | 852b20eded5cf8c61ff52930ade378242a8a772c (patch) | |
| tree | 84f1bc9d64773468789c94a33283584fae201a96 /ACE/include/makeinclude/rules.local.GNU | |
| parent | 1fde5ee900bcf4332c80e298d3a9e46b6a799496 (diff) | |
| download | ATCD-852b20eded5cf8c61ff52930ade378242a8a772c.tar.gz | |
Thu Mar 6 16:49:18 UTC 2008 Johnny Willemsen <jwillemsen@remedy.nl>
Diffstat (limited to 'ACE/include/makeinclude/rules.local.GNU')
| -rw-r--r-- | ACE/include/makeinclude/rules.local.GNU | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/ACE/include/makeinclude/rules.local.GNU b/ACE/include/makeinclude/rules.local.GNU index 5018417241d..24bd39706f5 100644 --- a/ACE/include/makeinclude/rules.local.GNU +++ b/ACE/include/makeinclude/rules.local.GNU @@ -110,7 +110,7 @@ $(VDIR)%.o: %.c $(VDIR)%.o: %.C $(mk_obj_out_dir) - $(COMPILE.cc) $(CC_OUTPUT_FLAG) $@ $< + $(COMPILE.c) $(CC_OUTPUT_FLAG) $@ $< ${MVCMD} $(VDIR)%.o: %.cpp @@ -140,6 +140,14 @@ $(VDIR)%.rc.o: %.rc # Otherwise, the .$(SOEXT) and .$(OBJEXT) are built via the same rule. # SOLINK is required for the repository under gcc. ifndef SOLINK +$(VSHDIR)%.$(OBJEXT): %.c + $(mk_obj_out_dir) + $(COMPILE.c) $(PIC) $(CC_OUTPUT_FLAG) $@ $< + +$(VSHDIR)%.$(OBJEXT): %.C + $(mk_obj_out_dir) + $(COMPILE.c) $(PIC) $(CC_OUTPUT_FLAG) $@ $< + # I added the "Executable Shared Object (ESO)" define to separate between # normal shared object files and executable shared object files (the kind # that the service configurator needs to be able to function). @@ -154,6 +162,10 @@ $(VSHDIR)%.$(SOEXT): %.cpp $(SOBUILD) endif # ESOBUILD +$(VSHDIR)%.$(OBJEXT): %.cc + $(mk_obj_out_dir) + $(COMPILE.cc) $(PIC) $(CC_OUTPUT_FLAG) $@ $< + ifeq ($(split), 1) $(VSHDIR)%.$(OBJEXT): %.cpp $(mk_obj_out_dir) @@ -167,22 +179,10 @@ $(VSHDIR)%.$(OBJEXT): %.cpp endif # split -$(VSHDIR)%.$(OBJEXT): %.cc - $(mk_obj_out_dir) - $(COMPILE.cc) $(PIC) $(CC_OUTPUT_FLAG) $@ $< - -$(VSHDIR)%.$(OBJEXT): %.C - $(mk_obj_out_dir) - $(COMPILE.cc) $(PIC) $(CC_OUTPUT_FLAG) $@ $< - $(VSHDIR)%.$(OBJEXT): %.cxx $(mk_obj_out_dir) $(COMPILE.cc) $(PIC) $(CC_OUTPUT_FLAG) $@ $< -$(VSHDIR)%.$(OBJEXT): %.c - $(mk_obj_out_dir) - $(COMPILE.c) $(PIC) $(CC_OUTPUT_FLAG) $@ $< - ifneq (,$(COMPILE.rc)) $(VSHDIR)%.rc.$(OBJEXT): %.rc $(mk_obj_out_dir) |