diff options
author | elliott_c <elliott_c@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2009-08-04 17:10:31 +0000 |
---|---|---|
committer | elliott_c <elliott_c@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2009-08-04 17:10:31 +0000 |
commit | fce69105fddf4cec0a5e03c3cec31c401a8fbfb7 (patch) | |
tree | faf24ddda1d51579a915aa201bd467772f72860d /ACE/include/makeinclude/rules.local.GNU | |
parent | d6f8197c1fddb7c0d782c8e600acb40d9d6c9551 (diff) | |
download | ATCD-fce69105fddf4cec0a5e03c3cec31c401a8fbfb7.tar.gz |
ChangeLogTag: Tue Aug 4 17:09:00 UTC 2009 Chad Elliott <elliott_c@ociweb.com>
Diffstat (limited to 'ACE/include/makeinclude/rules.local.GNU')
-rw-r--r-- | ACE/include/makeinclude/rules.local.GNU | 19 |
1 files changed, 1 insertions, 18 deletions
diff --git a/ACE/include/makeinclude/rules.local.GNU b/ACE/include/makeinclude/rules.local.GNU index 0255d0ccb34..c709dce114e 100644 --- a/ACE/include/makeinclude/rules.local.GNU +++ b/ACE/include/makeinclude/rules.local.GNU @@ -53,7 +53,7 @@ makefile_name.local: @echo endif -all.local: makefile_name.local $(split_target) build.objdirs build.local install.local +all.local: makefile_name.local build.objdirs build.local install.local #---------------------------------------------------------------------------- # C/C++ compilation targets @@ -170,19 +170,10 @@ $(VSHDIR)%.$(OBJEXT): %.cc $(mk_obj_out_dir) $(COMPILE.cc) $(PIC) $(CC_OUTPUT_FLAG)$(CC_OUTPUT_FLAG_SEP)$@ $< - ifeq ($(split), 1) -$(VSHDIR)%.$(OBJEXT): %.cpp - $(mk_obj_out_dir) - $(COMPILE.cc) $(PIC) SPLIT/`echo $< | sed "s/.cpp/_S\*/"` - mv *.$(OBJEXT) $(VSHDIR) - else # ! split - $(VSHDIR)%.$(OBJEXT): %.cpp $(mk_obj_out_dir) $(COMPILE.cc) $(PIC) $(CC_OUTPUT_FLAG)$(CC_OUTPUT_FLAG_SEP)$@ $< - endif # split - $(VSHDIR)%.$(OBJEXT): %.cxx $(mk_obj_out_dir) $(COMPILE.cc) $(PIC) $(CC_OUTPUT_FLAG)$(CC_OUTPUT_FLAG_SEP)$@ $< @@ -528,14 +519,6 @@ $(CLEANUP_DIRS): @test -d $@ || $(MKDIR) $@ $(ACE_NUL_STDERR) endif -#--------------------------------------------------------------------------- -# Source file splitting -#--------------------------------------------------------------------------- -SPLIT: - @echo "Splitting source files..." - @$(ACE_ROOT)/bin/split-cpp -s Svc_Conf_l.cpp -s Svc_Conf_y.cpp $(LSRC) - @echo "done." - svnignore.local: if [ "n$(ARCH_BIN)" != "n" ]; then \ (svn propget svn:ignore .; echo $(ARCH_BIN)) | sort | uniq | sed '/^$$/d' >SvNiGnOrE; \ |