--- trunk/OOPSE/utils/Makefile.in 2003/09/25 16:42:34 785 +++ trunk/OOPSE/utils/Makefile.in 2004/03/01 20:01:50 1074 @@ -125,8 +125,8 @@ QUICKLATE=quickLate$(EXE) MPI_CXXFLAGS=$(CXXFLAGS) $(MPI_INCLUDES) $(MPI_DECLARES) QUICKLATE=quickLate$(EXE) +ZSUB=zsub$(EXE) - BASS_LIB=$(TOP)/libBASS/libBASS.a BASS_MPI_LIB=$(TOP)/libBASS/libBASS_MPI.a MD_LIB=$(TOP)/libmdtools/libmdtools.a @@ -137,6 +137,9 @@ SRC_DIR := $(PWD) 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) + SRC_DIR := $(PWD) PREFS=-DOOPSE_HOME=\"$(OOPSE_HOME)\" @@ -158,8 +161,11 @@ QUICK_C_FILES = \ QUICK_C_FILES = \ $(DIR)/quickLate.c +ZSUB_CMD_C_OBJS = \ + $(DIR)/CmdlineZsub.c +ZSUB_FILES = \ + $(DIR)/zsub.cpp - DIR:=. QUICK_C_SRCS := $(QUICK_C_FILES) QUICK_SRCS := $(QUICK__C_SRCS) @@ -171,7 +177,11 @@ QUICK_OBJS := $(QUICK_C_OBJS) DIR:=obj QUICK_C_OBJS := $(QUICK_C_FILES:.c=.o) QUICK_OBJS := $(QUICK_C_OBJS) +ZSUB_CMD_OBJ :=$(ZSUB_CMD_C_OBJS:.c=.o) +ZSUB_CXX_OBJS := $(ZSUB_FILES:.cpp=.o) +ZSUB_OBJS := $(ZSUB_CXX_OBJS) $(ZSUB_CMD_OBJ) + DIR:=MPIobj QUICK_C_MPIOBJS := $(QUICK_C_FILES:.c=.o) QUICK_MPIOBJS := $(QUICK_C_MPIOBJS) @@ -179,16 +189,20 @@ all : $(QUICKLATE) obj \ MPIobj -all : $(QUICKLATE) +all : $(QUICKLATE) $(ZSUB) 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) + install : $(QUICKLATE) $(MKINSTALLDIRS) $(OOPSE_HOME)/bin $(INSTALL_PROGRAM) -s $(QUICKLATE) $(OOPSE_HOME)/bin/$(QUICKLATE) + $(INSTALL_PROGRAM) -s $(ZSUB) $(OOPSE_HOME)/bin/$(QUICKLATE) @@ -201,18 +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) clean : dummy for i in $(LIBSUBDIRS); do \ (cd $$i; $(RM) *.o) || exit 1; \ done - $(RM) $(QUICKLATE) *.o *~ Make.temp + $(RM) $(QUICKLATE) $(ZSUB) *.o *~ Make.temp distclean : dummy for i in $(LIBSUBDIRS); do \ (cd $$i; $(RM) *.o) || exit 1; \ done - $(RM) $(QUICKLATE) *.o *~ Make.temp + $(RM) $(QUICKLATE) $(ZSUB) *.o *~ Make.temp devclean : distclean