X-Git-Url: http://git.kpe.io/?p=ctsim.git;a=blobdiff_plain;f=tools%2FMakefile.in;h=5dfc5b8d9867b77c222e96519496df8a4e1c878f;hp=550e9e1097bb60d96cda562b47fcab2662edebce;hb=36c820a392f2e9e023d373aaf46e8bfb6018bdd4;hpb=da7c413d9b557a45c17a5af5d13de0825507a22d

diff --git a/tools/Makefile.in b/tools/Makefile.in
index 550e9e1..5dfc5b8 100644
--- a/tools/Makefile.in
+++ b/tools/Makefile.in
@@ -90,51 +90,24 @@ wxcflags = @wxcflags@
 wxconfig = @wxconfig@
 wxlibs = @wxlibs@
 
-bin_PROGRAMS = pjrec phm2pj pj2if @lamprograms@  ifinfo phm2if if1 if2 ifexport pjinfo
+bin_PROGRAMS = @lamprograms@  ctsimtext 
 bin_SCRIPTS = sample-ctsim.sh
-EXTRA_PROGRAMS = pjrec-lam phm2pj-lam phm2if-lam
+EXTRA_PROGRAMS = ctsimtext-lam
 INCLUDES = @my_includes@
-EXTRA_DIST = Makefile.nt mpiworld.cpp
 @HAVE_SGP_TRUE@SOURCE_DEPEND = ../include/ct.h ../libctsim/libctsim.a ../libctsupport/libctsupport.a ../libctgraphics/libctgraphics.a
 @HAVE_SGP_FALSE@SOURCE_DEPEND = ../include/ct.h ../libctsim/libctsim.a ../libctsupport/libctsupport.a
 
-pjrec_SOURCES = pjrec.cpp  
-pjrec_LDADD = @ctlibs@
-pjrec_DEPENDENCIES = $(SOURCE_DEPEND)
-phm2pj_SOURCES = phm2pj.cpp 
-phm2pj_LDADD = @ctlibs@
-phm2pj_DEPENDENCIES = $(SOURCE_DEPEND)
-phm2if_SOURCES = phm2if.cpp
-phm2if_LDADD = @ctlibs@
-phm2if_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)
-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)
-
-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@
+ctsimtext_SOURCES = ctsimtext.cpp if1.cpp if2.cpp ifinfo.cpp ifexport.cpp phm2if.cpp phm2pj.cpp pj2if.cpp pjinfo.cpp pjrec.cpp
+ctsimtext_LDADD = @ctlibs@
+ctsimtext_DEPENDENCIES = $(SOURCE_DEPEND)
+
+ctsimtext_lam_SOURCES = ctsimtext.cpp if1.cpp if2.cpp ifinfo.cpp ifexport.cpp phm2if.cpp phm2pj.cpp pj2if.cpp pjinfo.cpp pjrec.cpp mpiworld.cpp
+ctsimtext_lam_LDADD = @ctlamlibs@
 
 @USE_LAM_TRUE@CC_LAM = $(lamdir)/bin/hcp
 @USE_LAM_TRUE@LAM_EXTRA_SRC = mpiworld.cpp
+
+@USE_LAM_TRUE@ctsimtext_lam_DEPENDENCIES = $(SOURCE_DEPEND)
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 CONFIG_HEADER = ../config.h
 CONFIG_CLEAN_FILES =  sample-ctsim.sh
@@ -145,33 +118,12 @@ DEFS = @DEFS@ -I. -I$(srcdir) -I..
 CPPFLAGS = @CPPFLAGS@
 LDFLAGS = @LDFLAGS@
 LIBS = @LIBS@
-pjrec_lam_OBJECTS =  pjrec.o
-pjrec_lam_DEPENDENCIES = 
-pjrec_lam_LDFLAGS = 
-phm2pj_lam_OBJECTS =  phm2pj.o
-phm2pj_lam_DEPENDENCIES = 
-phm2pj_lam_LDFLAGS = 
-phm2if_lam_OBJECTS =  phm2if.o
-phm2if_lam_DEPENDENCIES = 
-phm2if_lam_LDFLAGS = 
-pjrec_OBJECTS =  pjrec.o
-pjrec_LDFLAGS = 
-phm2pj_OBJECTS =  phm2pj.o
-phm2pj_LDFLAGS = 
-pj2if_OBJECTS =  pj2if.o
-pj2if_LDFLAGS = 
-ifinfo_OBJECTS =  ifinfo.o
-ifinfo_LDFLAGS = 
-phm2if_OBJECTS =  phm2if.o
-phm2if_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 = 
+ctsimtext_lam_OBJECTS =  ctsimtext.o if1.o if2.o ifinfo.o ifexport.o \
+phm2if.o phm2pj.o pj2if.o pjinfo.o pjrec.o mpiworld.o
+ctsimtext_lam_LDFLAGS = 
+ctsimtext_OBJECTS =  ctsimtext.o if1.o if2.o ifinfo.o ifexport.o \
+phm2if.o phm2pj.o pj2if.o pjinfo.o pjrec.o
+ctsimtext_LDFLAGS = 
 SCRIPTS =  $(bin_SCRIPTS)
 
 CXXFLAGS = @CXXFLAGS@
@@ -185,11 +137,11 @@ DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
 
 TAR = gtar
 GZIP_ENV = --best
-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)
+DEP_FILES =  .deps/ctsimtext.P .deps/if1.P .deps/if2.P .deps/ifexport.P \
+.deps/ifinfo.P .deps/mpiworld.P .deps/phm2if.P .deps/phm2pj.P \
+.deps/pj2if.P .deps/pjinfo.P .deps/pjrec.P
+SOURCES = $(ctsimtext_lam_SOURCES) $(ctsimtext_SOURCES)
+OBJECTS = $(ctsimtext_lam_OBJECTS) $(ctsimtext_OBJECTS)
 
 all: all-redirect
 .SUFFIXES:
@@ -245,41 +197,9 @@ distclean-compile:
 
 maintainer-clean-compile:
 
-pjrec: $(pjrec_OBJECTS) $(pjrec_DEPENDENCIES)
-	@rm -f pjrec
-	$(CXXLINK) $(pjrec_LDFLAGS) $(pjrec_OBJECTS) $(pjrec_LDADD) $(LIBS)
-
-phm2pj: $(phm2pj_OBJECTS) $(phm2pj_DEPENDENCIES)
-	@rm -f phm2pj
-	$(CXXLINK) $(phm2pj_LDFLAGS) $(phm2pj_OBJECTS) $(phm2pj_LDADD) $(LIBS)
-
-pj2if: $(pj2if_OBJECTS) $(pj2if_DEPENDENCIES)
-	@rm -f pj2if
-	$(CXXLINK) $(pj2if_LDFLAGS) $(pj2if_OBJECTS) $(pj2if_LDADD) $(LIBS)
-
-ifinfo: $(ifinfo_OBJECTS) $(ifinfo_DEPENDENCIES)
-	@rm -f ifinfo
-	$(CXXLINK) $(ifinfo_LDFLAGS) $(ifinfo_OBJECTS) $(ifinfo_LDADD) $(LIBS)
-
-phm2if: $(phm2if_OBJECTS) $(phm2if_DEPENDENCIES)
-	@rm -f phm2if
-	$(CXXLINK) $(phm2if_LDFLAGS) $(phm2if_OBJECTS) $(phm2if_LDADD) $(LIBS)
-
-if1: $(if1_OBJECTS) $(if1_DEPENDENCIES)
-	@rm -f if1
-	$(CXXLINK) $(if1_LDFLAGS) $(if1_OBJECTS) $(if1_LDADD) $(LIBS)
-
-if2: $(if2_OBJECTS) $(if2_DEPENDENCIES)
-	@rm -f if2
-	$(CXXLINK) $(if2_LDFLAGS) $(if2_OBJECTS) $(if2_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)
+ctsimtext: $(ctsimtext_OBJECTS) $(ctsimtext_DEPENDENCIES)
+	@rm -f ctsimtext
+	$(CXXLINK) $(ctsimtext_LDFLAGS) $(ctsimtext_OBJECTS) $(ctsimtext_LDADD) $(LIBS)
 
 install-binSCRIPTS: $(bin_SCRIPTS)
 	@$(NORMAL_INSTALL)
@@ -411,6 +331,8 @@ check: check-am
 installcheck-am:
 installcheck: installcheck-am
 install-exec-am: install-binPROGRAMS install-binSCRIPTS
+	@$(NORMAL_INSTALL)
+	$(MAKE) $(AM_MAKEFLAGS) install-exec-hook
 install-exec: install-exec-am
 
 install-data-am:
@@ -476,17 +398,14 @@ distclean-generic clean-generic maintainer-clean-generic clean \
 mostlyclean distclean maintainer-clean
 
 
+install-exec-hook:
+	ln -s $(bindir)/ctsimtext $(bindir)/ifinfo
+
 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@ @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@ @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@ @lamdefs@ $(CFLAGS) $(INCLUDES) -DHAVE_MPI phm2if.cpp -o phm2if-lam $(LDFLAGS) $(LAM_EXTRA_SRC) @ctlibs@
+@USE_LAM_TRUE@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
+@USE_LAM_TRUE@	$(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@
 
 # 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.