[ViewVC] Diff of: group/trunk/OOPSE-2.0/make/Makefile.in

Comparing trunk/OOPSE-2.0/make/Makefile.in (file contents):
Revision 1517 by tim, Fri Oct 1 21:59:28 2004 UTC vs.
Revision 1518 by tim, Sat Oct 2 04:22:07 2004 UTC

#	Line 200 \| Line 200 \| ifneq "$(words $(ObjectFiles) $(ParallelObjectFiles))
200		Executable = $(BinDir)/$(Main)
201		ParallelExecutable = $(BinDir)/$(Main)_MPI
202		else
203	<	SharedLibrary = $(LibDir)/lib$(subst /,,$(Package)).so
204	<	StaticLibrary = $(LibDir)/lib$(subst /,,$(Package)).a
205	<	ParallelSharedLibrary = $(LibDir)/lib$(subst /,,$(Package))_MPI.so
206	<	ParallelStaticLibrary = $(LibDir)/lib$(subst /,,$(Package))_MPI.a
203	>	SharedLibrary = $(LibDir)/lib$(subst /,,$(patsubst %,oopse_%,$(Package))).so
204	>	StaticLibrary = $(LibDir)/lib$(subst /,,$(patsubst %,oopse_%,$(Package))).a
205	>	ParallelSharedLibrary = $(LibDir)/lib$(subst /,,$(patsubst %,oopse_%,$(Package)))_MPI.so
206	>	ParallelStaticLibrary = $(LibDir)/lib$(subst /,,$(patsubst %,oopse_%,$(Package)))_MPI.a
207		endif
208		endif
209		#
#	Line 213 \| Line 213 \| LocalLibs = $(subst /,,$(PackageLibs))
213		JavaPackageNames = $(subst /,.,$(JavaPackages))
214		IncludePath = -I$(SourceDir) $(IncludeDirs:%=-I%)
215		LibDirs = -L$(LibDir) $(LibraryDirs:%=-L%)
216	<	LocalLibs = $(subst /,,$(PackageLibs))
216	>	LocalLibs = $(subst /,,$(patsubst %, oopse_%, $(PackageLibs)))
217		LibList = $(LocalLibs:%=-l%) $(Libraries:%=-l%)
218
219

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