[MOAB-dev] r3976 - MOAB/trunk/examples

[kraftche at cae.wisc.edu]

Author: kraftche
Date: 2010-05-28 11:05:03 -0500 (Fri, 28 May 2010)
New Revision: 3976

Modified:
   MOAB/trunk/examples/Makefile.am
   MOAB/trunk/examples/examples.make.in
Log:
Appologies for the repeated checkins.  As per Tim's preference, use a simple
solution that doesn't involve suffix rules at all for examples/makefile.


Modified: MOAB/trunk/examples/Makefile.am
===================================================================
--- MOAB/trunk/examples/Makefile.am	2010-05-28 15:59:43 UTC (rev 3975)
+++ MOAB/trunk/examples/Makefile.am	2010-05-28 16:05:03 UTC (rev 3976)
@@ -46,10 +46,10 @@
 	rm -f $(ex_make)
 	mv $(DESTDIR)$(exampledir)/examples.make $(ex_make)
 	echo "all: $(check_PROGRAMS)" >>$(ex_make)
-	rule='	$$(CXX) -o $$@ $$< $$(MOAB_LIBS_LINK)'; \
+	rule='	$$(CXX) -o $$@ $$< $$(CXXFLAGS) $$(MOAB_INCLUDES) $$(MOAB_LIBS_LINK)'; \
 	for example in $(check_PROGRAMS); do \
 	  echo >>$(ex_make); \
-	  echo "$${example}: $${example}.o" >>$(ex_make); \
+	  echo "$${example}: $${example}.cpp" >>$(ex_make); \
 	  echo "$$rule" >>$(ex_make); \
 	done
 

Modified: MOAB/trunk/examples/examples.make.in
===================================================================
--- MOAB/trunk/examples/examples.make.in	2010-05-28 15:59:43 UTC (rev 3975)
+++ MOAB/trunk/examples/examples.make.in	2010-05-28 16:05:03 UTC (rev 3976)
@@ -3,14 +3,7 @@
 libdir = @libdir@
 include $(libdir)/moab.make
 
-CPPFLAGS = ${MOAB_INCLUDES}
 CXXFLAGS = -g
 
 default: all
 
-.SUFFIXES: .cpp
-
-.cpp.o:
-	$(CXX) -c $< $(CPPFLAGS) $(CXXFLAGS)
-
-