X-Git-Url: http://git.kpe.io/?a=blobdiff_plain;f=tools%2FMakefile.in;h=550e9e1097bb60d96cda562b47fcab2662edebce;hb=9b2bb510160bdb56f04847f5b55ab61dd8a47976;hp=b3f82fa9def43d559b185d8ec4dc5e28cb03bbed;hpb=04d5009bc18e7bf51ab9d8fab1e8c6a1a86af919;p=ctsim.git diff --git a/tools/Makefile.in b/tools/Makefile.in index b3f82fa..550e9e1 100644 --- a/tools/Makefile.in +++ b/tools/Makefile.in @@ -78,6 +78,7 @@ cgiprograms = @cgiprograms@ ctlibs = @ctlibs@ htmldata = @htmldata@ htmldir = @htmldir@ +lamdefs = @lamdefs@ lamdir = @lamdir@ lamprograms = @lamprograms@ mpienable = @mpienable@ @@ -89,7 +90,7 @@ wxcflags = @wxcflags@ wxconfig = @wxconfig@ wxlibs = @wxlibs@ -bin_PROGRAMS = pjrec phm2pj pj2if @lamprograms@ ifinfo phm2if if-1 if-2 if2img +bin_PROGRAMS = pjrec phm2pj pj2if @lamprograms@ ifinfo phm2if if1 if2 ifexport pjinfo bin_SCRIPTS = sample-ctsim.sh EXTRA_PROGRAMS = pjrec-lam phm2pj-lam phm2if-lam INCLUDES = @my_includes@ @@ -106,18 +107,21 @@ phm2pj_DEPENDENCIES = $(SOURCE_DEPEND) phm2if_SOURCES = phm2if.cpp phm2if_LDADD = @ctlibs@ phm2if_DEPENDENCIES = $(SOURCE_DEPEND) -if2img_SOURCES = if2img.cpp -if2img_LDADD = @ctlibs@ -if2img_DEPENDENCIES = $(SOURCE_DEPEND) +ifexport_SOURCES = ifexport.cpp +ifexport_LDADD = @ctlibs@ +ifexport_DEPENDENCIES = $(SOURCE_DEPEND) pj2if_SOURCES = pj2if.cpp pj2if_LDADD = @ctlibs@ pj2if_DEPENDENCIES = $(SOURCE_DEPEND) -if_1_SOURCES = if-1.cpp -if_1_LDADD = @ctlibs@ -if_1_DEPENDENCIES = $(SOURCE_DEPEND) -if_2_SOURCES = if-2.cpp -if_2_LDADD = @ctlibs@ -if_2_DEPENDENCIES = $(SOURCE_DEPEND) +pjinfo_SOURCES = pjinfo.cpp +pjinfo_LDADD = @ctlibs@ +pjinfo_DEPENDENCIES = $(SOURCE_DEPEND) +if1_SOURCES = if1.cpp +if1_LDADD = @ctlibs@ +if1_DEPENDENCIES = $(SOURCE_DEPEND) +if2_SOURCES = if2.cpp +if2_LDADD = @ctlibs@ +if2_DEPENDENCIES = $(SOURCE_DEPEND) ifinfo_SOURCES = ifinfo.cpp ifinfo_LDADD = @ctlibs@ ifinfo_DEPENDENCIES = $(SOURCE_DEPEND) @@ -129,7 +133,7 @@ phm2if_lam_LDADD = @ctlamlibs@ phm2pj_lam_SOURCES = phm2pj.cpp phm2pj_lam_LDADD = @ctlamlibs@ -@USE_LAM_TRUE@CC_LAM = $(lamdir)/bin/balky +@USE_LAM_TRUE@CC_LAM = $(lamdir)/bin/hcp @USE_LAM_TRUE@LAM_EXTRA_SRC = mpiworld.cpp mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_HEADER = ../config.h @@ -160,12 +164,14 @@ ifinfo_OBJECTS = ifinfo.o ifinfo_LDFLAGS = phm2if_OBJECTS = phm2if.o phm2if_LDFLAGS = -if_1_OBJECTS = if-1.o -if_1_LDFLAGS = -if_2_OBJECTS = if-2.o -if_2_LDFLAGS = -if2img_OBJECTS = if2img.o -if2img_LDFLAGS = +if1_OBJECTS = if1.o +if1_LDFLAGS = +if2_OBJECTS = if2.o +if2_LDFLAGS = +ifexport_OBJECTS = ifexport.o +ifexport_LDFLAGS = +pjinfo_OBJECTS = pjinfo.o +pjinfo_LDFLAGS = SCRIPTS = $(bin_SCRIPTS) CXXFLAGS = @CXXFLAGS@ @@ -177,12 +183,13 @@ DIST_COMMON = Makefile.am Makefile.in sample-ctsim.sh.in DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) -TAR = tar +TAR = gtar GZIP_ENV = --best -DEP_FILES = .deps/if-1.P .deps/if-2.P .deps/if2img.P .deps/ifinfo.P \ -.deps/phm2if.P .deps/phm2pj.P .deps/pj2if.P .deps/pjrec.P -SOURCES = $(pjrec_lam_SOURCES) $(phm2pj_lam_SOURCES) $(phm2if_lam_SOURCES) $(pjrec_SOURCES) $(phm2pj_SOURCES) $(pj2if_SOURCES) $(ifinfo_SOURCES) $(phm2if_SOURCES) $(if_1_SOURCES) $(if_2_SOURCES) $(if2img_SOURCES) -OBJECTS = $(pjrec_lam_OBJECTS) $(phm2pj_lam_OBJECTS) $(phm2if_lam_OBJECTS) $(pjrec_OBJECTS) $(phm2pj_OBJECTS) $(pj2if_OBJECTS) $(ifinfo_OBJECTS) $(phm2if_OBJECTS) $(if_1_OBJECTS) $(if_2_OBJECTS) $(if2img_OBJECTS) +DEP_FILES = .deps/if1.P .deps/if2.P .deps/ifexport.P .deps/ifinfo.P \ +.deps/phm2if.P .deps/phm2pj.P .deps/pj2if.P .deps/pjinfo.P \ +.deps/pjrec.P +SOURCES = $(pjrec_lam_SOURCES) $(phm2pj_lam_SOURCES) $(phm2if_lam_SOURCES) $(pjrec_SOURCES) $(phm2pj_SOURCES) $(pj2if_SOURCES) $(ifinfo_SOURCES) $(phm2if_SOURCES) $(if1_SOURCES) $(if2_SOURCES) $(ifexport_SOURCES) $(pjinfo_SOURCES) +OBJECTS = $(pjrec_lam_OBJECTS) $(phm2pj_lam_OBJECTS) $(phm2if_lam_OBJECTS) $(pjrec_OBJECTS) $(phm2pj_OBJECTS) $(pj2if_OBJECTS) $(ifinfo_OBJECTS) $(phm2if_OBJECTS) $(if1_OBJECTS) $(if2_OBJECTS) $(ifexport_OBJECTS) $(pjinfo_OBJECTS) all: all-redirect .SUFFIXES: @@ -258,17 +265,21 @@ phm2if: $(phm2if_OBJECTS) $(phm2if_DEPENDENCIES) @rm -f phm2if $(CXXLINK) $(phm2if_LDFLAGS) $(phm2if_OBJECTS) $(phm2if_LDADD) $(LIBS) -if-1: $(if_1_OBJECTS) $(if_1_DEPENDENCIES) - @rm -f if-1 - $(CXXLINK) $(if_1_LDFLAGS) $(if_1_OBJECTS) $(if_1_LDADD) $(LIBS) +if1: $(if1_OBJECTS) $(if1_DEPENDENCIES) + @rm -f if1 + $(CXXLINK) $(if1_LDFLAGS) $(if1_OBJECTS) $(if1_LDADD) $(LIBS) -if-2: $(if_2_OBJECTS) $(if_2_DEPENDENCIES) - @rm -f if-2 - $(CXXLINK) $(if_2_LDFLAGS) $(if_2_OBJECTS) $(if_2_LDADD) $(LIBS) +if2: $(if2_OBJECTS) $(if2_DEPENDENCIES) + @rm -f if2 + $(CXXLINK) $(if2_LDFLAGS) $(if2_OBJECTS) $(if2_LDADD) $(LIBS) -if2img: $(if2img_OBJECTS) $(if2img_DEPENDENCIES) - @rm -f if2img - $(CXXLINK) $(if2img_LDFLAGS) $(if2img_OBJECTS) $(if2img_LDADD) $(LIBS) +ifexport: $(ifexport_OBJECTS) $(ifexport_DEPENDENCIES) + @rm -f ifexport + $(CXXLINK) $(ifexport_LDFLAGS) $(ifexport_OBJECTS) $(ifexport_LDADD) $(LIBS) + +pjinfo: $(pjinfo_OBJECTS) $(pjinfo_DEPENDENCIES) + @rm -f pjinfo + $(CXXLINK) $(pjinfo_LDFLAGS) $(pjinfo_OBJECTS) $(pjinfo_LDADD) $(LIBS) install-binSCRIPTS: $(bin_SCRIPTS) @$(NORMAL_INSTALL) @@ -333,7 +344,7 @@ distdir: $(DISTFILES) @for file in $(DISTFILES); do \ d=$(srcdir); \ if test -d $$d/$$file; then \ - cp -pr $$/$$file $(distdir)/$$file; \ + cp -pr $$d/$$file $(distdir)/$$file; \ else \ test -f $(distdir)/$$file \ || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ @@ -469,16 +480,13 @@ realclean: rm -f *.pgm *.if *~ *.pj @USE_LAM_TRUE@pjrec-lam: pjrec.cpp mpiworld.cpp ../include/ct.h ../libctsim/libctsim.a ../libctsupport/libctsupport.a -@USE_LAM_TRUE@ $(CC_LAM) @DEFS@ $(CFLAGS) $(INCLUDES) -DHAVE_MPI pjrec.cpp -o pjrec-lam $(LDFLAGS) $(LAM_EXTRA_SRC) @ctlibs@ +@USE_LAM_TRUE@ $(CC_LAM) @DEFS@ @lamdefs@ $(CFLAGS) $(INCLUDES) -DHAVE_MPI pjrec.cpp -o pjrec-lam $(LDFLAGS) $(LAM_EXTRA_SRC) @ctlibs@ @USE_LAM_TRUE@phm2pj-lam: phm2pj.cpp mpiworld.cpp ../include/ct.h ../libctsim/libctsim.a ../libctsupport/libctsupport.a -@USE_LAM_TRUE@ $(CC_LAM) @DEFS@ $(CFLAGS) $(INCLUDES) -DHAVE_MPI phm2pj.cpp -o phm2pj-lam $(LDFLAGS) $(LAM_EXTRA_SRC) @ctlibs@ +@USE_LAM_TRUE@ $(CC_LAM) @DEFS@ @lamdefs@ $(CFLAGS) $(INCLUDES) -DHAVE_MPI phm2pj.cpp -o phm2pj-lam $(LDFLAGS) $(LAM_EXTRA_SRC) @ctlibs@ @USE_LAM_TRUE@phm2if-lam: phm2if.cpp mpiworld.cpp ../include/ct.h ../libctsim/libctsim.a ../libctsupport/libctsupport.a -@USE_LAM_TRUE@ $(CC_LAM) @DEFS@ $(CFLAGS) $(INCLUDES) -DHAVE_MPI phm2if.cpp -o phm2if-lam $(LDFLAGS) $(LAM_EXTRA_SRC) @ctlibs@ - -shared: pjrec.cpp phm2pj.cpp - $(CC) @DEFS@ $(CFLAGS) $(INCLUDES) -DNO_MAIN -shared phm2pj.cpp pjrec.cpp @ctlibs@ $(LDFLAGS) -o ir.so +@USE_LAM_TRUE@ $(CC_LAM) @DEFS@ @lamdefs@ $(CFLAGS) $(INCLUDES) -DHAVE_MPI phm2if.cpp -o phm2if-lam $(LDFLAGS) $(LAM_EXTRA_SRC) @ctlibs@ # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded.