X-Git-Url: http://git.kpe.io/?a=blobdiff_plain;f=tools%2FMakefile.am;h=ae0ffe698a22dac1e26d201fe7ee516e29c1a606;hb=HEAD;hp=963d8f32820ab12b91642b7bf7874d2074a9ab27;hpb=4200add84ac2d531eafd1c09a2e58f6252102f5b;p=ctsim.git

diff --git a/tools/Makefile.am b/tools/Makefile.am
index 963d8f3..ae0ffe6 100644
--- a/tools/Makefile.am
+++ b/tools/Makefile.am
@@ -1,6 +1,6 @@
 bin_PROGRAMS = @lamprograms@  ctsimtext 
 EXTRA_PROGRAMS = ctsimtext-lam
-INCLUDES=@my_includes@
+AM_CPPFLAGS=@my_includes@
 
 if HAVE_SGP
 SOURCE_DEPEND=../include/ct.h ../libctsim/libctsim.a ../libctsupport/libctsupport.a ../libctgraphics/libctgraphics.a
@@ -9,26 +9,26 @@ SOURCE_DEPEND=../include/ct.h ../libctsim/libctsim.a ../libctsupport/libctsuppor
 endif
 
 install-exec-hook:
-	ln -sf ctsimtext $(bindir)/if1
-	ln -sf ctsimtext $(bindir)/if2
-	ln -sf ctsimtext $(bindir)/ifexport
-	ln -sf ctsimtext $(bindir)/ifinfo
-	ln -sf ctsimtext $(bindir)/phm2if
-	ln -sf ctsimtext $(bindir)/phm2pj
-	ln -sf ctsimtext $(bindir)/phm2helix
-	ln -sf ctsimtext $(bindir)/pj2if
-	ln -sf ctsimtext $(bindir)/pjinfo
-	ln -sf ctsimtext $(bindir)/pjrec
-	ln -sf ctsimtext $(bindir)/pjHinterp
-
-ctsimtext_SOURCES = ctsimtext.cpp if1.cpp if2.cpp ifinfo.cpp ifexport.cpp phm2if.cpp phm2pj.cpp pj2if.cpp pjinfo.cpp pjrec.cpp nographics.cpp phm2helix.cpp pjHinterp.cpp
+	ln -sf ctsimtext $(DESTDIR)$(bindir)/if1
+	ln -sf ctsimtext $(DESTDIR)$(bindir)/if2
+	ln -sf ctsimtext $(DESTDIR)$(bindir)/ifexport
+	ln -sf ctsimtext $(DESTDIR)$(bindir)/ifinfo
+	ln -sf ctsimtext $(DESTDIR)$(bindir)/phm2if
+	ln -sf ctsimtext $(DESTDIR)$(bindir)/phm2pj
+	ln -sf ctsimtext $(DESTDIR)$(bindir)/phm2helix
+	ln -sf ctsimtext $(DESTDIR)$(bindir)/pj2if
+	ln -sf ctsimtext $(DESTDIR)$(bindir)/pjinfo
+	ln -sf ctsimtext $(DESTDIR)$(bindir)/pjrec
+	ln -sf ctsimtext $(DESTDIR)$(bindir)/pjHinterp
+	ln -sf ctsimtext $(DESTDIR)$(bindir)/linogram
+
+ctsimtext_SOURCES = ctsimtext.cpp if1.cpp if2.cpp ifinfo.cpp ifexport.cpp phm2if.cpp phm2pj.cpp pj2if.cpp pjinfo.cpp pjrec.cpp nographics.cpp phm2helix.cpp pjHinterp.cpp linogram.cpp
 ctsimtext_LDADD=@ctlibs@
 ctsimtext_DEPENDENCIES=$(SOURCE_DEPEND)
 
-realclean:
-	rm -f *.pgm *.if *~ *.pj
+CLEANFILES=\*.pgm \*.if \*~ \*.pj sample-ctsim.sh
 
-ctsimtext_lam_SOURCES = ctsimtext.cpp if1.cpp if2.cpp ifinfo.cpp ifexport.cpp phm2if.cpp phm2pj.cpp pj2if.cpp pjinfo.cpp pjrec.cpp nographics.cpp mpiworld.cpp phm2helix.cpp pjHinterp.cpp
+ctsimtext_lam_SOURCES = ctsimtext.cpp if1.cpp if2.cpp ifinfo.cpp ifexport.cpp phm2if.cpp phm2pj.cpp pj2if.cpp pjinfo.cpp pjrec.cpp nographics.cpp mpiworld.cpp phm2helix.cpp pjHinterp.cpp linogram.cpp
 ctsimtext_lam_LDADD=@ctlamlibs@
 
 if USE_LAM
@@ -37,7 +37,7 @@ LAM_EXTRA_SRC = mpiworld.cpp
 
 ctsimtext_lam_DEPENDENCIES=$(SOURCE_DEPEND)
 
-ctsimtext-lam: ctsimtext.cpp if1.cpp if2.cpp ifinfo.cpp ifexport.cpp phm2if.cpp phm2pj.cpp pj2if.cpp pjinfo.cpp pjrec.cpp mpiworld.cpp ../include/ct.h ../libctsim/libctsim.a ../libctsupport/libctsupport.a
+ctsimtext-lam$(EXEEXT): ctsimtext.cpp if1.cpp if2.cpp ifinfo.cpp ifexport.cpp phm2if.cpp phm2pj.cpp pj2if.cpp pjinfo.cpp pjrec.cpp mpiworld.cpp linogram.cpp ../include/ct.h ../libctsim/libctsim.a ../libctsupport/libctsupport.a
 	$(CC_LAM) @DEFS@ @lamdefs@ $(CFLAGS) $(INCLUDES) -DHAVE_MPI -DNO_MAIN ctsimtext.cpp if1.cpp if2.cpp ifinfo.cpp ifexport.cpp phm2if.cpp phm2pj.cpp pj2if.cpp pjinfo.cpp pjrec.cpp -o ctsimtext-lam $(LDFLAGS) $(LAM_EXTRA_SRC) @ctlibs@
 
 endif