Author: sebor
Date: Tue Dec 11 21:54:37 2007
New Revision: 603470
URL: http://svn.apache.org/viewvc?rev=603470&view=rev
Log:
2007-12-11 Martin Sebor <[EMAIL PROTECTED]>
Merged in rev 602770 with a fix for STDCXX-650 from trunk.
* etc/config/makefile.rules: Duplicated rules for sources matching
"*.out.cpp" and objects matching "*.out.o" (Only the latter appears
necessary).
Modified:
incubator/stdcxx/branches/4.2.x/etc/config/makefile.rules
Modified: incubator/stdcxx/branches/4.2.x/etc/config/makefile.rules
URL:
http://svn.apache.org/viewvc/incubator/stdcxx/branches/4.2.x/etc/config/makefile.rules?rev=603470&r1=603469&r2=603470&view=diff
==============================================================================
--- incubator/stdcxx/branches/4.2.x/etc/config/makefile.rules (original)
+++ incubator/stdcxx/branches/4.2.x/etc/config/makefile.rules Tue Dec 11
21:54:37 2007
@@ -87,8 +87,16 @@
endif # ifneq ($(AS_EXT),".")
endif # ifneq ($(AS_EXT),)
+# make the rule match for sources matching *.out.cpp
+%.out.o: %.out.cpp
+ $(CXX) -c $(CPPFLAGS) $(CXXFLAGS) $(call CXX.repo,$<) $<
+
%.o: %.cpp
$(CXX) -c $(CPPFLAGS) $(CXXFLAGS) $(call CXX.repo,$<) $<
+
+# make the rule match for objects matching *.out.o
+%.out: %.out.o
+ $(LD) $< -o $@ $(LDFLAGS) $(LDLIBS) $(call CXX.repo,$<)
%: %.o
$(LD) $< -o $@ $(LDFLAGS) $(LDLIBS) $(call CXX.repo,$<)
