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

Comparing trunk/OOPSE-2.0/make/Makefile.in (file contents):
Revision 2157 by gezelter, Mon Apr 11 16:14:05 2005 UTC vs.
Revision 2199 by gezelter, Thu Apr 14 21:41:56 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 \
# Line 75 | Line 77 | IncludeDirs = \
77          samples/zcons \
78  
79   IncludeDirs = \
80 <        @MPI_INC_DIR@
80 >        @CGAL_INC_DIR@ \
81 >        @MPI_INC_DIR@
82  
83   LibraryDirs = \
84 +        @CGAL_LIB_DIR@ \
85          @MPI_LIB_DIR@
86  
87   Libraries = \
88 +        @CGAL_LIBS@ \
89          @MPI_LIB@ \
90 <        @MPI_F90_LIB@
90 >        @MPI_F90_LIB@
91  
92   OopseHome       = @OOPSE_HOME@
93   ForceParamDir   = $(OopseHome)/share/forceFields
# Line 235 | Line 240 | tr = $(eval __t := $3)                                
240   [0-9] := 0 1 2 3 4 5 6 7 8 9 #
241   [A-F] := A B C D E F #
242  
243 < # Upper case and lower case functions.  Each function has a single
244 < # argument which is the text to alter
243 > # Figure out whether we have $(eval) or not (GNU Make 3.80 and above)
244 > # if we do not then we need to use the shell version of tr, and not the
245 > # faster tr function above:
246  
247 < uc = $(call tr,$([a-z]),$([A-Z]),$1)
248 < lc = $(call tr,$([A-Z]),$([a-z]),$1)
247 > __have_eval := $(false)
248 > __ignore := $(eval __have_eval := $(true))
249 >
250 > ifndef __have_eval
251 >  uc = $(shell echo $1 | tr "a-z" "A-Z")
252 >  lc = $(shell echo $1 | tr "A-Z" "a-z")
253 > else
254 >  uc = $(call tr,$([a-z]),$([A-Z]),$1)
255 >  lc = $(call tr,$([A-Z]),$([a-z]),$1)
256 > endif
257  
258   # OK, now we can actually use these functions to figure out the names
259   # of the module files:
# Line 806 | Line 820 | cvslog:
820  
821   #make cvslog
822   cvslog:
823 <        $(DEV_ROOT)/scripts/cvs2cl.pl
823 >        $(DEV_ROOT)/scripts/cvs2cl
824  
825   # Execute
826   _runexe :

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines