ViewVC Help
View File | Revision Log | Show Annotations | View Changeset | Root Listing
root/OpenMD/branches/devel_omp/make/Makefile.in
(Generate patch)

Comparing trunk/make/Makefile.in (file contents):
Revision 1086 by gezelter, Mon Oct 23 18:21:41 2006 UTC vs.
Revision 1137 by chuckv, Tue May 29 22:50:14 2007 UTC

# Line 39 | Line 39 | PackageLibs = \
39   PackageLibs = \
40          utils \
41          visitors \
42 +        QuickHull \
43          math \
44          types \
45          primitives \
# Line 64 | Line 65 | Applications = \
65          applications/dynamicProps \
66          applications/simpleBuilder \
67          applications/randomBuilder \
67 –        applications/nanoRodBuilder \
68          applications/nanoparticleBuilder \
69          applications/thermalizer \
70          applications/atom2md \
# Line 100 | Line 100 | IncludeDirs = \
100   IncludeDirs = \
101          @MPI_INC_DIR@ \
102          @FFTW_INC_DIR@ \
103 –        @CGAL_INC_DIR@ \
103          @ZLIB_INC_DIR@
104  
105   LibraryDirs = \
106          @MPI_LIB_DIR@ \
107          @FFTW_LIB_DIR@ \
109 –        @CGAL_LIB_DIR@ \
108          @ZLIB_LIB_DIR@
109  
110   Libraries = \
# Line 114 | Line 112 | Libraries = \
112          @MPI_LIB@ \
113          @MPI_F90_LIB@ \
114          @FFTW_LIBS@ \
117 –        @CGAL_LIBS@ \
115          @ZLIB@
116  
117   OopseHome       = @OOPSE_HOME@
# Line 138 | Line 135 | LinkOptions = \
135   LinkOptions = \
136          @LDFLAGS@ \
137          @FCLIBS@ \
138 <        @CXXFLAGS@ \
142 <        @CGAL_CXXFLAGS@
138 >        @CXXFLAGS@  
139  
140  
141   ParallelLinkOptions = \
142          @LDFLAGS@ \
143          @FCLIBS@ \
144 <        @CXXFLAGS@ \
149 <        @CGAL_CXXFLAGS@
144 >        @CXXFLAGS@
145  
146  
147   #---------------------------------------------------------------------------
# Line 404 | Line 399 | CParallelOptions       = $(FrcDeclare) $(SingleDeclare
399                           -sourcepath $(SourceDir)
400   COptions               = $(FrcDeclare) $(SingleDeclare) @CFLAGS@
401   CParallelOptions       = $(FrcDeclare) $(SingleDeclare) $(ParallelDeclare) @CFLAGS@
402 < CppOptions             = $(FrcDeclare) $(SingleDeclare) @CXXFLAGS@ @CGAL_CXXFLAGS@
403 < CppParallelOptions     = $(FrcDeclare) $(SingleDeclare) $(ParallelDeclare) @CXXFLAGS@ @CGAL_CXXFLAGS@
402 > CppOptions             = $(FrcDeclare) $(SingleDeclare) @CXXFLAGS@
403 > CppParallelOptions     = $(FrcDeclare) $(SingleDeclare) $(ParallelDeclare) @CXXFLAGS@
404   ifeq "$(UseSingle)" "yes"
405   FortranOptions         =  @FCFLAGS@ @MODDIRFLAG@$(SourceDir) @MODDIRFLAG@$(TargetDir) @PREPDEFFLAG@$(SingleDeclare) @FCFLAGS_SRCEXT@
406   FortranParallelOptions =  @FCFLAGS@ @MODDIRFLAG@$(SourceDir) @MODDIRFLAG@$(ParallelTargetDir) @PREPDEFFLAG@$(SingleDeclare) @PREPDEFFLAG@$(ParallelDeclare) @FCFLAGS_SRCEXT@

Diff Legend

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