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

Comparing trunk/OOPSE-2.0/make/Makefile (file contents):
Revision 1506 by tim, Wed Sep 29 17:12:15 2004 UTC vs.
Revision 1511 by tim, Wed Sep 29 21:32:39 2004 UTC

# Line 100 | Line 100 | Package          = $(subst $(SourceDir)/,,$(CurrentDir
100   CurrentDir       = $(CURDIR)
101  
102   ifdef Source
103 < Package          = $(subst $(SourceDir)/,,$(CurrentDir))
103 > #Package          = $(subst $(SourceDir)/,,$(CurrentDir))
104 > #Package          = $(notdir $(CurrentDir))
105 >
106 > #get the relative path of current package to source directory
107 > # /home/maul/gezelter/src/code/src/UseTheForce/Darkside --> UseTheForce/Darkside
108 > #Package          = $(shell echo $(CurrentDir) | sed -e 's/^.*\/src\/\(.*\)/\1/g')
109 > Package          = $(subst $(shell cd $(SourceDir); pwd)/,,$(CurrentDir))
110 >
111   PackageList      = $(Package)
112   PackageSourceDir = $(SourceDir)/$(Package)
113   PackageTargetDir = $(TargetDir)
# Line 110 | Line 117 | PackageListLoop  = $(patsubst %,$(SourceDir)/%/.loop,$
117   endif
118  
119   PackageListLoop  = $(patsubst %,$(SourceDir)/%/.loop,$(PackageList))
120 + #PackageListLoop  = $(PackageList)
121  
122   JRE              = $(JAVA_HOME)/jre/lib/rt.jar
123  
# Line 139 | Line 147 | SourceFiles            = $(JavaFiles:%.java=  $(Packag
147                                        $(YaccFiles) $(CorbaFiles), \
148                                        $(Source))
149   ManifestFile           = $(PackageSourceDir)/Manifest
150 < SourceFiles            = $(JavaFiles:%.java=  $(PackageSourceDir)/%.java)\
150 >
151 > SourceFiles            = $(JavaFiles)\
152 >                         $(CppFiles)\
153 >                         $(CFiles)\
154 >                         $(FortranFiles)\
155 >                         $(F90Files)\
156 >                         $(LexFiles)\
157 >                         $(YaccFiles)
158 >
159 > #SourceFiles            = $(JavaFiles:%.java=  $(PackageSourceDir)/%.java)\
160                           $(CppFiles:%.cpp=    $(PackageSourceDir)/%.cpp)\
161                           $(CFiles:%.c=        $(PackageSourceDir)/%.c)\
162                           $(FortranFiles:%.f=  $(PackageSourceDir)/%.f)\
# Line 147 | Line 164 | SourceFiles            = $(JavaFiles:%.java=  $(Packag
164                           $(LexFiles:%.l=      $(PackageSourceDir)/%.l)\
165                           $(YaccFiles:%.y=     $(PackageSourceDir)/%.y)\
166  
150 –
167   # Target
168   JavaClassFiles         = $(JavaFiles:%.java=  $(PackageTargetDir)/%.class)
169   JavaClassFilesRel      = $(JavaFiles:%.java=  $(Package)/%.class)
# Line 273 | Line 289 | default : build
289   default : build
290  
291   %.loop :
292 +        $(Print) $(SourceFiles)
293          @$(MAKE) $(MakeOptions) -C $(subst .loop,,$@) _$(MAKECMDGOALS)all
294  
295   # Create target directory

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines