[cig-commits] r18916 - short/3D/PyLith/trunk/libsrc/pylith

[knepley at geodynamics.org]

Author: knepley
Date: 2011-09-15 17:02:40 -0700 (Thu, 15 Sep 2011)
New Revision: 18916

Modified:
   short/3D/PyLith/trunk/libsrc/pylith/Makefile.am
Log:
Fixed CUDA rule


Modified: short/3D/PyLith/trunk/libsrc/pylith/Makefile.am
===================================================================
--- short/3D/PyLith/trunk/libsrc/pylith/Makefile.am	2011-09-15 22:33:29 UTC (rev 18915)
+++ short/3D/PyLith/trunk/libsrc/pylith/Makefile.am	2011-09-16 00:02:40 UTC (rev 18916)
@@ -27,19 +27,18 @@
 	friction \
 	problems
 
+SUFFIXES=.cu
+
+LTCUDACOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+	--mode=compile nvcc $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+	$(AM_CPPFLAGS) $(CPPFLAGS) -m64 -prefer-non-pic $(AM_CXXFLAGS) $(NVCC_FLAGS)
+
 .cu.lo:
-	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile nvcc --compile -prefer-non-pic -m64 $(NVCC_FLAGS) -o ${@F} $<
-	echo "# ${@F} - a libtool object file" > ${@}
-	echo "# Generated by ltmain.sh (GNU libtool) 2.2.4" >> ${@}
-	echo "#" >> ${@}
-	echo "# Please DO NOT delete this file!" >> ${@}
-	echo "# It is necessary for linking the library." >> ${@}
-	echo >> ${@}
-	echo "# Name of the PIC object." >> ${@}
-	echo "pic_object='../.libs/${*F}.o'" >> ${@}
-	echo  >> ${@}
-	echo "# Name of the non-PIC object" >> ${@}
-	echo "non_pic_object=none" >> ${@}
+ at am__fastdepCXX_FALSE@	$(LTCUDACOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+ at am__fastdepCXX_FALSE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+ at AMDEP_TRUE@@am__fastdepCXX_TRUE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCXX_TRUE@	DEPDIR=$(DEPDIR) depmode=none $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCXX_TRUE@	$(LTCUDACOMPILE) -c -o $@ $<
 
 lib_LTLIBRARIES = libpylith.la