--- trunk/OOPSE/utils/Makefile.in 2004/03/01 20:01:50 1074 +++ trunk/OOPSE/utils/Makefile.in 2004/04/19 17:44:48 1119 @@ -125,7 +125,7 @@ ZSUB=zsub$(EXE) MPI_CXXFLAGS=$(CXXFLAGS) $(MPI_INCLUDES) $(MPI_DECLARES) QUICKLATE=quickLate$(EXE) -ZSUB=zsub$(EXE) +Dump2XYZ=Dump2XYZ$(EXE) BASS_LIB=$(TOP)/libBASS/libBASS.a BASS_MPI_LIB=$(TOP)/libBASS/libBASS_MPI.a @@ -137,8 +137,8 @@ ZSUB_LDFLAGS=-L$(TOP)/libBASS -L$(TOP)/libmdtools -L$( QUICKLATE_LDFLAGS=-L$(TOP)/libBASS -L$(TOP)/libmdtools -L$(SPRNG_LIBDIR) QUICKLATE_LDADD=-lmdtools -lBASS -lsprng $(F90LIBS) -ZSUB_LDFLAGS=-L$(TOP)/libBASS -L$(TOP)/libmdtools -L$(SPRNG_LIBDIR) -ZSUB_LDADD=-lmdtools -lBASS -lsprng $(F90LIBS) +Dump2XYZ_LDFLAGS=-L$(TOP)/libBASS -L$(TOP)/libmdtools -L$(SPRNG_LIBDIR) +Dump2XYZ_LDADD=-lmdtools -lBASS -lsprng $(F90LIBS) SRC_DIR := $(PWD) @@ -161,10 +161,10 @@ ZSUB_CMD_C_OBJS = \ QUICK_C_FILES = \ $(DIR)/quickLate.c -ZSUB_CMD_C_OBJS = \ - $(DIR)/CmdlineZsub.c -ZSUB_FILES = \ - $(DIR)/zsub.cpp +Dump2XYZ_CMD_C_OBJS = \ + $(DIR)/Dump2XYZCmd.c +Dump2XYZ_FILES = \ + $(DIR)/Dump2XYZ.cpp DIR:=. QUICK_C_SRCS := $(QUICK_C_FILES) @@ -177,10 +177,10 @@ ZSUB_CMD_OBJ :=$(ZSUB_CMD_C_OBJS:.c=.o) DIR:=obj QUICK_C_OBJS := $(QUICK_C_FILES:.c=.o) QUICK_OBJS := $(QUICK_C_OBJS) -ZSUB_CMD_OBJ :=$(ZSUB_CMD_C_OBJS:.c=.o) +Dump2XYZ_CMD_OBJ :=$(Dump2XYZ_CMD_C_OBJS:.c=.o) -ZSUB_CXX_OBJS := $(ZSUB_FILES:.cpp=.o) -ZSUB_OBJS := $(ZSUB_CXX_OBJS) $(ZSUB_CMD_OBJ) +Dump2XYZ_CXX_OBJS := $(Dump2XYZ_FILES:.cpp=.o) +Dump2XYZ_OBJS := $(Dump2XYZ_CXX_OBJS) $(Dump2XYZ_CMD_OBJ) DIR:=MPIobj QUICK_C_MPIOBJS := $(QUICK_C_FILES:.c=.o) @@ -189,20 +189,20 @@ all : $(QUICKLATE) $(ZSUB) obj \ MPIobj -all : $(QUICKLATE) $(ZSUB) +all : $(QUICKLATE) $(Dump2XYZ) depend: Make.dep quickLate$(EXE) : $(QUICK_OBJS) $(BASS_LIB) $(MD_LIB) $(CC) $(CFLAGS) $(QUICK_OBJS) -o $@ $(QUICKLATE_LDFLAGS) $(QUICKLATE_LDADD) -zsub$(EXE) : $(ZSUB_OBJS) $(BASS_LIB) $(MD_LIB) - $(CXX) $(CXXFLAGS) $(ZSUB_OBJS) -o $@ $(ZSUB_LDFLAGS) $(ZSUB_LDADD) +Dump2XYZ$(EXE) : $(Dump2XYZ_OBJS) $(BASS_LIB) $(MD_LIB) + $(CXX) $(CXXFLAGS) $(Dump2XYZ_OBJS) -o $@ $(Dump2XYZ_LDFLAGS) $(Dump2XYZ_LDADD) install : $(QUICKLATE) $(MKINSTALLDIRS) $(OOPSE_HOME)/bin $(INSTALL_PROGRAM) -s $(QUICKLATE) $(OOPSE_HOME)/bin/$(QUICKLATE) - $(INSTALL_PROGRAM) -s $(ZSUB) $(OOPSE_HOME)/bin/$(QUICKLATE) + $(INSTALL_PROGRAM) -s $(Dump2XYZ) $(OOPSE_HOME)/bin/$(QUICKLATE) @@ -215,19 +215,19 @@ links : $(OOPSE_HOME)/bin/$(QUICKLATE) links : $(OOPSE_HOME)/bin/$(QUICKLATE) $(MKINSTALLDIRS) $(PREFIX)/bin cd $(PREFIX)/bin; $(LN_S) -f $(OOPSE_HOME)/bin/$(QUICKLATE) $(QUICKLATE) - cd $(PREFIX)/bin; $(LN_S) -f $(OOPSE_HOME)/bin/$(ZSUB) $(ZSUB) + cd $(PREFIX)/bin; $(LN_S) -f $(OOPSE_HOME)/bin/$(Dump2XYZ) $(Dump2XYZ) clean : dummy for i in $(LIBSUBDIRS); do \ (cd $$i; $(RM) *.o) || exit 1; \ done - $(RM) $(QUICKLATE) $(ZSUB) *.o *~ Make.temp + $(RM) $(QUICKLATE) $(Dump2XYZ) *.o *~ Make.temp distclean : dummy for i in $(LIBSUBDIRS); do \ (cd $$i; $(RM) *.o) || exit 1; \ done - $(RM) $(QUICKLATE) $(ZSUB) *.o *~ Make.temp + $(RM) $(QUICKLATE) $(Dump2XYZ) *.o *~ Make.temp devclean : distclean