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 2126 by gezelter, Mon Mar 21 19:22:55 2005 UTC vs.
Revision 2190 by gezelter, Wed Apr 13 22:30:22 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 204 | Line 209 | OtherTargetFiles       = $(OtherSourceFiles:%=$(Packag
209                           $(LexFiles:%.l=     %.c)
210  
211   OtherTargetFiles       = $(OtherSourceFiles:%=$(PackageTargetDir)/%)
212 +
213 + ###########################################################################
214 + #
215 + # Figure out the names of the module files based on some work done by
216 + # configure.  The tr function below is from John Graham-Cumming
217 + # (http://www.jgc.org).
218 + #
219 + # The tr function.   Has three arguments:
220 + #
221 + # $1   The list of characters to translate from
222 + # $2   The list of characters to translate to
223 + # $3   The text to translate
224 + #
225 + # For example, $(call tr,A B C,1 2 3,CAPITAL) becomes 21PIT1L.
226 +
227 + tr = $(eval __t := $3)                                                    \
228 +     $(foreach c,                                                         \
229 +         $(join $(addsuffix :,$1),$2),                                    \
230 +         $(eval __t :=                                                    \
231 +             $(subst $(word 1,$(subst :, ,$c)),$(word 2,$(subst :, ,$c)), \
232 +                 $(__t))))$(__t)
233 +
234 + # Common character classes for use with the tr function.  Each of
235 + # these is actually a variable declaration and must be wrapped with
236 + # $() or ${} to be used.
237 +
238 + [A-Z] := A B C D E F G H I J K L M N O P Q R S T U V W X Y Z #
239 + [a-z] := a b c d e f g h i j k l m n o p q r s t u v w x y z #
240 + [0-9] := 0 1 2 3 4 5 6 7 8 9 #
241 + [A-F] := A B C D E F #
242 +
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 + __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:
260 +
261 + ifneq "$(words $(Modules))" "0"
262 + ifeq "$(ModuleCase)" "UPPER"
263 +  MODULES = $(call uc,$(Modules))
264 + else
265 +  ifeq "$(ModuleCase)" "lower"
266 +    MODULES = $(call lc,$(Modules))
267 +  else
268 +    MODULES = $(Modules)
269 +  endif
270 + endif
271 +  ModuleFiles = $(MODULES:%= $(PackageTargetDir)/%.$(ModSuffix))
272 +  ParallelModuleFiles = $(MODULES:%= $(PackageParallelTargetDir)/%.$(ModSuffix))
273 + endif
274 + #
275 + ###########################################################################
276  
277   ThirdPartyJarsTmp = $(patsubst %,$(LibDir)/%,$(JavaLibraries))
278   ThirdPartyJars    = $(subst $(Space),$(X),$(ThirdPartyJarsTmp))
# Line 218 | Line 287 | ifneq  "$(words $(ObjectFiles) $(ParallelObjectFiles))
287    DependencyFile    = $(PackageSourceDir)/Makedepend
288    ifneq "$(words $(Main))" "0"
289      Executable             = $(BinDir)/$(Main)
290 <    ParallelExecutable     = $(BinDir)/$(Main)_MPI
290 >    ifeq "$(BuiltParallelExe)" "1"
291 >      ParallelExecutable     = $(BinDir)/$(Main)_MPI
292 >    endif
293    else
294      SharedLibrary          = $(LibDir)/lib$(subst /,,$(patsubst %,oopse_%,$(Package)))_UP.so
295      StaticLibrary          = $(LibDir)/lib$(subst /,,$(patsubst %,oopse_%,$(Package)))_UP.a
# Line 620 | Line 691 | endif
691          $(Executable)
692   endif
693  
694 + echo : $(PackageListLoop)
695 +        $(Print) Done echo.
696  
697 + _echoall :
698 +        $(Print) $(Modules)
699 +
700   # make clean
701   clean : $(PackageListLoop)
702          $(Print) Done clean.    
# Line 628 | Line 704 | _cleanall :
704   _cleanall :
705          $(Delete) \
706                  $(ObjectFiles) \
707 +                $(ModuleFiles) \
708                  $(ParallelObjectFiles) \
709 +                $(ParallelModuleFiles) \
710                  $(JarFile) \
711                  $(SharedLibrary) \
712                  $(StaticLibrary) \

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines