ViewVC Help
View File | Revision Log | Show Annotations | View Changeset | Root Listing
root/group/trunk/OOPSE-4/make/Makefile.in
(Generate patch)

Comparing trunk/OOPSE-4/make/Makefile.in (file contents):
Revision 2157 by gezelter, Mon Apr 11 16:14:05 2005 UTC vs.
Revision 2202 by tim, Fri Apr 15 18:41:38 2005 UTC

# Line 51 | Line 51 | PackageLibs = \
51          minimizers \
52          selection \
53          restraints \
54 +        lattice \
55  
56   #packages containing applications
57   Applications = \
58          applications/oopse \
59          applications/dump2Xyz \
59        applications/simpleBuilder\
60          applications/staticProps \
61          applications/dynamicProps \
62 +        applications/simpleBuilder\
63 +        applications/nanoRodBuilder \
64  
65   Samples = \
66          samples/argon \
67 <        samples/water/dimer \
67 >        samples/water/dimer \
68          samples/water/spce \
69          samples/water/ssd \
70          samples/water/ssde \
71 +        samples/water/ssdrf \
72 +        samples/water/ssd-ion \
73          samples/water/tip3p_ice \
74          samples/water/tip4p \
75          samples/lipid \
76          samples/alkane \
77          samples/minimizer \
78          samples/metals \
79 +        samples/thermoIntegration/liquid \
80 +        samples/thermoIntegration/solid \
81 +        samples/dipole \
82 +        samples/shape \
83          samples/zcons \
84  
85   IncludeDirs = \
86 <        @MPI_INC_DIR@
86 >        @CGAL_INC_DIR@ \
87 >        @MPI_INC_DIR@
88  
89   LibraryDirs = \
90 +        @CGAL_LIB_DIR@ \
91          @MPI_LIB_DIR@
92  
93   Libraries = \
94 +        @CGAL_LIBS@ \
95          @MPI_LIB@ \
96 <        @MPI_F90_LIB@
96 >        @MPI_F90_LIB@
97  
98   OopseHome       = @OOPSE_HOME@
99   ForceParamDir   = $(OopseHome)/share/forceFields
# Line 235 | Line 246 | tr = $(eval __t := $3)                                
246   [0-9] := 0 1 2 3 4 5 6 7 8 9 #
247   [A-F] := A B C D E F #
248  
249 < # Upper case and lower case functions.  Each function has a single
250 < # argument which is the text to alter
249 > # Figure out whether we have $(eval) or not (GNU Make 3.80 and above)
250 > # if we do not then we need to use the shell version of tr, and not the
251 > # faster tr function above:
252  
253 < uc = $(call tr,$([a-z]),$([A-Z]),$1)
254 < lc = $(call tr,$([A-Z]),$([a-z]),$1)
253 > __have_eval := $(false)
254 > __ignore := $(eval __have_eval := $(true))
255  
256 + ifndef __have_eval
257 +  uc = $(shell echo $1 | tr "a-z" "A-Z")
258 +  lc = $(shell echo $1 | tr "A-Z" "a-z")
259 + else
260 +  uc = $(call tr,$([a-z]),$([A-Z]),$1)
261 +  lc = $(call tr,$([A-Z]),$([a-z]),$1)
262 + endif
263 +
264   # OK, now we can actually use these functions to figure out the names
265   # of the module files:
266  
# Line 806 | Line 826 | cvslog:
826  
827   #make cvslog
828   cvslog:
829 <        $(DEV_ROOT)/scripts/cvs2cl.pl
829 >        $(DEV_ROOT)/scripts/cvs2cl
830  
831   # Execute
832   _runexe :

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines