r589: Added threaded rasterizer

[ctsim.git] / src / Makefile.am

diff --git a/src/Makefile.am b/src/Makefile.am
index 5349601e3e4d044b022c7f4ce9916fe9aa9fee76..1dc75b5c28fe1a4c8a5db1b9417be53eb34bfccd 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,55 +1,14 @@
-bin_PROGRAMS = ctsim pjrec phm2pj pj2if @lamprograms@  ifinfo phm2if if-1 if-2 if2img 
-bin_SCRIPTS = sample-pjrec.sh
-EXTRA_PROGRAMS = pjrec-lam phm2pj-lam phm2if-lam
-INCLUDES=@my_includes@
-EXTRA_DIST=Makefile.nt mpiworld.cpp
+bin_PROGRAMS=ctsim
 
-ctsim_SOURCES = ctsim.cpp
-ctsim_LDADD = @ctlibs@
-pjrec_SOURCES = pjrec.cpp 
-pjrec_LDADD=@ctlibs@
-phm2pj_SOURCES=phm2pj.cpp
-phm2pj_LDADD=@ctlibs@
-phm2if_SOURCES = phm2if.cpp
-phm2if_LDADD=@ctlibs@
-if2img_SOURCES = if2img.cpp
-if2img_LDADD=@ctlibs@
-pj2if_SOURCES = pj2if.cpp
-pj2if_LDADD=@ctlibs@
-if_1_SOURCES=if-1.cpp
-if_1_LDADD=@ctlibs@
-if_2_SOURCES=if-2.cpp
-if_2_LDADD=@ctlibs@
-ifinfo_SOURCES = ifinfo.cpp
-ifinfo_LDADD=@ctlibs@
+ctsim_SOURCES=ctsim.cpp docs.cpp views.cpp dialogs.cpp ctsim.h docs.h \
+views.h dialogs.h dlgprojections.cpp dlgprojections.h dlgreconstruct.cpp \
+dlgreconstruct.h  graph3dview.cpp graph3dview.h ctsim-map.h ctsim.xpm \
+splash.xpm tips.cpp tips.h threadrecon.cpp threadrecon.h backgroundmgr.cpp \
+backgroundmgr.h backgroundsupr.cpp backgroundsupr.h threadproj.cpp \
+threadproj.h threadraster.cpp threadraster.h
 
-pjrec_lam_SOURCES=pjrec.cpp
-pjrec_lam_LDADD=@ctlamlibs@
-phm2if_lam_SOURCES=phm2if.cpp
-phm2if_lam_LDADD=@ctlamlibs@
-phm2pj_lam_SOURCES=phm2pj.cpp
-phm2pj_lam_LDADD=@ctlamlibs@
-
-realclean:
-       rm -f *.pgm *.if *~ *.pj
-
-if USE_LAM
-CC_LAM = $(lamdir)/bin/balky
-LAM_EXTRA_SRC = mpiworld.cpp
-
-pjrec-lam: pjrec.cpp mpiworld.cpp ../include/ct.h  ../libctsim/libctsim.a ../libctsupport/libctsupport.a
-       $(CC_LAM) @DEFS@ $(CFLAGS) $(INCLUDES) -DHAVE_MPI pjrec.cpp -o pjrec-lam $(LDFLAGS) $(LAM_EXTRA_SRC) @ctlibs@
-
-phm2pj-lam: phm2pj.cpp mpiworld.cpp ../include/ct.h ../libctsim/libctsim.a ../libctsupport/libctsupport.a
-       $(CC_LAM) @DEFS@ $(CFLAGS) $(INCLUDES) -DHAVE_MPI phm2pj.cpp -o phm2pj-lam $(LDFLAGS) $(LAM_EXTRA_SRC) @ctlibs@
-
-phm2if-lam: phm2if.cpp mpiworld.cpp ../include/ct.h ../libctsim/libctsim.a ../libctsupport/libctsupport.a
-       $(CC_LAM) @DEFS@ $(CFLAGS) $(INCLUDES) -DHAVE_MPI phm2if.cpp -o phm2if-lam $(LDFLAGS) $(LAM_EXTRA_SRC) @ctlibs@
-
-endif
-
-shared: pjrec.cpp phm2pj.cpp 
-       $(CC) @DEFS@ $(CFLAGS) $(INCLUDES) -DNO_MAIN -shared phm2pj.cpp pjrec.cpp @ctlibs@ $(LDFLAGS) -o ir.so
+ctsim_DEPENDENCIES=../libctgraphics/libctgraphics.a ../libctsupport/libctsupport.a ../libctsim/libctsim.a ../include/ct.h
+ctsim_LDADD=-L../libctgraphics -L../libctsupport -L../libctsim @ctlibs@