From 73075ec5fe1c667164ab2f826fdd12a392460223 Mon Sep 17 00:00:00 2001 From: sjplimp Date: Thu, 30 May 2013 19:48:45 +0000 Subject: [PATCH] git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9974 f3b2605a-c512-4ea7-a41b-209d697bcdaa --- lib/poems/Makefile.g++ | 6 ++- lib/poems/Makefile.icc | 6 ++- lib/poems/Makefile.storm | 101 --------------------------------------- 3 files changed, 8 insertions(+), 105 deletions(-) delete mode 100644 lib/poems/Makefile.storm diff --git a/lib/poems/Makefile.g++ b/lib/poems/Makefile.g++ index ca870456bc..20d00a6034 100644 --- a/lib/poems/Makefile.g++ +++ b/lib/poems/Makefile.g++ @@ -15,10 +15,11 @@ # * CONTACT: anderk5@rpi.edu * # *_________________________________________________________________________*/ - - SHELL = /bin/sh +# which file will be copied to Makefile.lammps + +EXTRAMAKE = Makefile.lammps.empty # ------ FILES ------ @@ -80,6 +81,7 @@ SYSLIB = lib: $(OBJ) $(ARCHIVE) $(ARFLAGS) $(LIB) $(OBJ) + @cp $(EXTRAMAKE) Makefile.lammps # ------ COMPILE RULES ------ diff --git a/lib/poems/Makefile.icc b/lib/poems/Makefile.icc index 8cdb268910..8431f9b35c 100644 --- a/lib/poems/Makefile.icc +++ b/lib/poems/Makefile.icc @@ -15,10 +15,11 @@ # * CONTACT: anderk5@rpi.edu * # *_________________________________________________________________________*/ - - SHELL = /bin/sh +# which file will be copied to Makefile.lammps + +EXTRAMAKE = Makefile.lammps.empty # ------ FILES ------ @@ -80,6 +81,7 @@ SYSLIB = lib: $(OBJ) $(ARCHIVE) $(ARFLAGS) $(LIB) $(OBJ) + @cp $(EXTRAMAKE) Makefile.lammps # ------ COMPILE RULES ------ diff --git a/lib/poems/Makefile.storm b/lib/poems/Makefile.storm deleted file mode 100644 index 52cfe8b4af..0000000000 --- a/lib/poems/Makefile.storm +++ /dev/null @@ -1,101 +0,0 @@ -# * -# *_________________________________________________________________________* -# * POEMS: PARALLELIZABLE OPEN SOURCE EFFICIENT MULTIBODY SOFTWARE * -# * DESCRIPTION: SEE READ-ME * -# * FILE NAME: Makefile * -# * AUTHORS: See Author List * -# * GRANTS: See Grants List * -# * COPYRIGHT: (C) 2005 by Authors as listed in Author's List * -# * LICENSE: Please see License Agreement * -# * DOWNLOAD: Free at www.rpi.edu/~anderk5 * -# * ADMINISTRATOR: Prof. Kurt Anderson * -# * Computational Dynamics Lab * -# * Rensselaer Polytechnic Institute * -# * 110 8th St. Troy NY 12180 * -# * CONTACT: anderk5@rpi.edu * -# *_________________________________________________________________________*/ - - - -SHELL = /bin/sh - - -# ------ FILES ------ - -SRC_MAIN = workspace.cpp system.cpp poemsobject.cpp -INC_MAIN = workspace.h system.h poemsobject.h - -SRC_BODY = body.cpp rigidbody.cpp particle.cpp inertialframe.cpp -INC_BODY = bodies.h body.h rigidbody.h particle.h inertialframe.h - - -SRC_JOINT = joint.cpp revolutejoint.cpp prismaticjoint.cpp sphericaljoint.cpp \ - freebodyjoint.cpp body23joint.cpp mixedjoint.cpp -INC_JOINT = joints.h joint.h revolutejoint.h prismaticjoint.h sphericaljoint.h \ - freebodyjoint.h body23joint.h mixedjoint.h - -SRC_POINT = point.cpp fixedpoint.cpp -INC_POINT = points.h point.h fixedpoint.h - -SRC_SOLVE = solver.cpp -INC_SOLVE = solver.h - -SRC_ORDERN = onsolver.cpp onfunctions.cpp onbody.cpp -INC_ORDERN = onsolver.h onfunctions.h onbody.h - -SRC_MAT = virtualmatrix.cpp matrix.cpp matrixfun.cpp mat3x3.cpp virtualcolmatrix.cpp \ - colmatrix.cpp vect3.cpp virtualrowmatrix.cpp rowmatrix.cpp mat6x6.cpp vect6.cpp \ - fastmatrixops.cpp colmatmap.cpp eulerparameters.cpp vect4.cpp norm.cpp mat4x4.cpp \ - -INC_MAT = matrices.h virtualmatrix.h matrix.h matrixfun.h mat3x3.h virtualcolmatrix.h \ - colmatrix.h vect3.h virtualrowmatrix.h rowmatrix.h mat6x6.h vect6.h \ - fastmatrixops.h colmatmap.h eulerparameters.h vect4.h norm.h mat4x4.h - -SRC_MISC = poemstreenode.cpp -INC_MISC = poemslist.h poemstreenode.h poemstree.h poemsnodelib.h SystemProcessor.h defines.h POEMSChain.h - -SRC = $(SRC_MAIN) $(SRC_BODY) $(SRC_JOINT) $(SRC_POINT) $(SRC_SOLVE) $(SRC_ORDERN) $(SRC_MAT) $(SRC_MISC) -INC = $(INC_MAIN) $(INC_BODY) $(INC_JOINT) $(INC_POINT) $(INC_SOLVE) $(INC_ORDERN) $(INC_MAT) $(INC_MISC) - -FILES = $(SRC) $(INC) Makefile Authors_List.txt Grants_List.txt POEMS_License.txt README Copyright_Notice - -# ------ DEFINITIONS ------ - -LIB = libpoems.a -OBJ = $(SRC:.cpp=.o) - -# ------ SETTINGS ------ - -CC = CC -CCFLAGS = -O -fPIC -g -Wall #-Wno-deprecated -ARCHIVE = ar -ARCHFLAG = -rc -DEPFLAGS = -M -LINK = CC -LINKFLAGS = -O -USRLIB = -SYSLIB = - -# ------ MAKE PROCEDURE ------ - -lib: $(OBJ) - $(ARCHIVE) $(ARFLAGS) $(LIB) $(OBJ) - -# ------ COMPILE RULES ------ - -%.o:%.cpp - $(CC) $(CCFLAGS) -c $< -%.d:%.cpp - $(CC) $(CCFLAGS) $(DEPFLAGS) $< > $@ - -# ------ DEPENDENCIES ------ - -DEPENDS = $(OBJ:.o=.d) - -# ------ CLEAN ------ - -clean: - -rm *.o *.d *~ $(LIB) - -tar: - -tar -cvf ../POEMS.tar $(FILES)