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 1951 by gezelter, Fri Jan 14 21:13:24 2005 UTC vs.
Revision 2157 by gezelter, Mon Apr 11 16:14:05 2005 UTC

# Line 49 | Line 49 | PackageLibs = \
49          integrators\
50          constraints \
51          minimizers \
52 +        selection \
53 +        restraints \
54  
55   #packages containing applications
56   Applications = \
57          applications/oopse \
58          applications/dump2Xyz \
59          applications/simpleBuilder\
60 +        applications/staticProps \
61 +        applications/dynamicProps \
62  
63   Samples = \
64          samples/argon \
# Line 71 | Line 75 | IncludeDirs = \
75          samples/zcons \
76  
77   IncludeDirs = \
74        @SPRNG_INC_DIR@ \
78          @MPI_INC_DIR@
79  
80   LibraryDirs = \
78        @SPRNG_LIB_DIR@ \
81          @MPI_LIB_DIR@
82  
83   Libraries = \
82        @SPRNG_LIB@ \
84          @MPI_LIB@ \
85          @MPI_F90_LIB@
86  
# Line 204 | Line 205 | ThirdPartyJarsTmp = $(patsubst %,$(LibDir)/%,$(JavaLib
205  
206   OtherTargetFiles       = $(OtherSourceFiles:%=$(PackageTargetDir)/%)
207  
208 + ###########################################################################
209 + #
210 + # Figure out the names of the module files based on some work done by
211 + # configure.  The tr function below is from John Graham-Cumming
212 + # (http://www.jgc.org).
213 + #
214 + # The tr function.   Has three arguments:
215 + #
216 + # $1   The list of characters to translate from
217 + # $2   The list of characters to translate to
218 + # $3   The text to translate
219 + #
220 + # For example, $(call tr,A B C,1 2 3,CAPITAL) becomes 21PIT1L.
221 +
222 + tr = $(eval __t := $3)                                                    \
223 +     $(foreach c,                                                         \
224 +         $(join $(addsuffix :,$1),$2),                                    \
225 +         $(eval __t :=                                                    \
226 +             $(subst $(word 1,$(subst :, ,$c)),$(word 2,$(subst :, ,$c)), \
227 +                 $(__t))))$(__t)
228 +
229 + # Common character classes for use with the tr function.  Each of
230 + # these is actually a variable declaration and must be wrapped with
231 + # $() or ${} to be used.
232 +
233 + [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 #
234 + [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 #
235 + [0-9] := 0 1 2 3 4 5 6 7 8 9 #
236 + [A-F] := A B C D E F #
237 +
238 + # Upper case and lower case functions.  Each function has a single
239 + # argument which is the text to alter
240 +
241 + uc = $(call tr,$([a-z]),$([A-Z]),$1)
242 + lc = $(call tr,$([A-Z]),$([a-z]),$1)
243 +
244 + # OK, now we can actually use these functions to figure out the names
245 + # of the module files:
246 +
247 + ifneq "$(words $(Modules))" "0"
248 + ifeq "$(ModuleCase)" "UPPER"
249 +  MODULES = $(call uc,$(Modules))
250 + else
251 +  ifeq "$(ModuleCase)" "lower"
252 +    MODULES = $(call lc,$(Modules))
253 +  else
254 +    MODULES = $(Modules)
255 +  endif
256 + endif
257 +  ModuleFiles = $(MODULES:%= $(PackageTargetDir)/%.$(ModSuffix))
258 +  ParallelModuleFiles = $(MODULES:%= $(PackageParallelTargetDir)/%.$(ModSuffix))
259 + endif
260 + #
261 + ###########################################################################
262 +
263   ThirdPartyJarsTmp = $(patsubst %,$(LibDir)/%,$(JavaLibraries))
264   ThirdPartyJars    = $(subst $(Space),$(X),$(ThirdPartyJarsTmp))
265  
# Line 215 | Line 271 | ifneq  "$(words $(ObjectFiles) $(ParallelObjectFiles))
271   #if Main is defined, do not build library. It may not be true sometimes
272   ifneq  "$(words $(ObjectFiles) $(ParallelObjectFiles))" "0"
273    DependencyFile    = $(PackageSourceDir)/Makedepend
274 <  ifneq "$(Main)" ""
274 >  ifneq "$(words $(Main))" "0"
275      Executable             = $(BinDir)/$(Main)
276 <    ParallelExecutable     = $(BinDir)/$(Main)_MPI
276 >    ifeq "$(BuiltParallelExe)" "1"
277 >      ParallelExecutable     = $(BinDir)/$(Main)_MPI
278 >    endif
279    else
280      SharedLibrary          = $(LibDir)/lib$(subst /,,$(patsubst %,oopse_%,$(Package)))_UP.so
281      StaticLibrary          = $(LibDir)/lib$(subst /,,$(patsubst %,oopse_%,$(Package)))_UP.a
# Line 255 | Line 313 | InstallData            = @INSTALL_DATA@
313   MakeDepend             = makedepend
314   INSTALL                = @INSTALL@
315   InstallProgram         = @INSTALL_PROGRAM@
316 + InstallScript          = @INSTALL_SCRIPT@
317   InstallData            = @INSTALL_DATA@
318   MkDir                  = @MKINSTALLDIRS@
319   Delete                 = rm -fr
# Line 617 | Line 676 | endif
676          $(JarFile) \
677          $(Executable)
678   endif
679 +
680 + echo : $(PackageListLoop)
681 +        $(Print) Done echo.
682  
683 + _echoall :
684 +        $(Print) $(Modules)
685  
686   # make clean
687   clean : $(PackageListLoop)
688          $(Print) Done clean.    
689  
690   _cleanall :
691 <        $(Delete) $(ObjectFiles) $(ParallelObjectFiles)
691 >        $(Delete) \
692 >                $(ObjectFiles) \
693 >                $(ModuleFiles) \
694 >                $(ParallelObjectFiles) \
695 >                $(ParallelModuleFiles) \
696 >                $(JarFile) \
697 >                $(SharedLibrary) \
698 >                $(StaticLibrary) \
699 >                $(ParallelSharedLibrary) \
700 >                $(ParallelStaticLibrary) \
701 >                $(CombinedStaticLib) \
702 >                $(CombinedParallelStaticLib)
703  
704   # make distclean
705   distclean : $(PackageListLoop)
706          $(Print) Done clean.    
707  
708 < _distcleanall :
709 <        $(Delete) $(ObjectFiles) \
635 <                  $(ParallelObjectFiles) \
636 <                        $(JarFile) \
637 <                  $(SharedLibrary) \
638 <                  $(StaticLibrary) \
639 <                  $(ParallelSharedLibrary) \
640 <                  $(ParallelStaticLibrary) \
641 <                  $(Executable) \
708 > _distcleanall : _cleanall
709 >        $(Delete) $(Executable) \
710                    $(ParallelExecutable) \
711                    $(DependencyFile)
712  
645
713   # make depend
714   depend : $(PackageListLoop)
715          $(Print) Done dependencies.
# Line 718 | Line 785 | ifneq "$(words $(InstallFiles))" "0"
785   _installdata :  $(MyInstallDir)
786          $(Print) $(InstallFiles)
787   ifneq "$(words $(InstallFiles))" "0"
788 <        $(InstallData) $(InstallFiles) $(MyInstallDir)
788 >        $(InstallCommand) $(InstallFiles) $(MyInstallDir)
789   endif      
790  
791   # make statistics

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines