--- trunk/SHAPES/Makefile	2004/06/15 20:24:51	1273
+++ trunk/SHAPES/Makefile	2004/06/24 13:44:53	1294
@@ -19,15 +19,15 @@ PREFIX=/usr/local
 # Path prefix for installation links
 PREFIX=/usr/local
 
-# Location of the oopse home
+# Location of the shapes home
 SHAPES_HOME=/usr/local/shapes
 VDW_PARAM_DIR=/usr/local/shapes/share/vdwFiles
 
 # C compiler
-CC=icc8
+CC=gcc
 
 # C++ compiler
-CXX=icpc8
+CXX=g++
 
 # ar
 AR=ar
@@ -47,14 +47,18 @@ MKINSTALLDIRS=@MKINSTALLDIRS@
 INSTALL_DATA=@INSTALL_DATA@
 MKINSTALLDIRS=@MKINSTALLDIRS@
 
+# fftw library and include files
+FFTWINC = -I/usr/local/include
+FFTWLIB = -L/usr/local/lib/ -lfftw3
+
 # CPP flags
 CPPFLAGS=
 
 # C flags
-CFLAGS_C=
+CFLAGS_C= -O3 
 
 # C++ flags
-CXXFLAGS_C=
+CXXFLAGS_C= -O3
 
 # LDFLAGS
 LDFLAGS=
@@ -65,10 +69,10 @@ INCLUDES= -I..
 
 # include paths starting with "." are all relative to the SUBDIRS!!!
 
-INCLUDES= -I..
+INCLUDES= -I.. $(FFTWINC) 
 
-CFLAGS=$(CFLAGS_C) $(INCLUDES) $(DECLARE)
-CXXFLAGS=$(CXXFLAGS_C) $(INCLUDES) $(DECLARE)
+CFLAGS=$(CFLAGS_C) $(INCLUDES) $(DECLARE) 
+CXXFLAGS=$(CXXFLAGS_C) $(INCLUDES) $(DECLARE) 
 DEPFLAGS=$(CFLAGS_C) -I. 
 
 SRC_DIR := ..
@@ -88,13 +92,22 @@ C_FILES = \
 #
 C_FILES = \
 	$(DIR)/forcerCmd.c \
-	$(DIR)/MatVec3.c
+	$(DIR)/MatVec3.c \
+	$(DIR)/cospmls.c \
+	$(DIR)/makeweights.c \
+	$(DIR)/naive_synthesis.c \
+	$(DIR)/pmls.c \
+	$(DIR)/primitive.c \
+	$(DIR)/seminaive.c \
+	$(DIR)/FST_semi_memo.c 
 
 CXX_FILES = \
 	$(DIR)/forcer.cpp \
 	$(DIR)/PDBReader.cpp \
 	$(DIR)/RigidBody.cpp \
-	$(DIR)/VDWAtom.cpp
+	$(DIR)/VDWAtom.cpp \
+        $(DIR)/GridBuilder.cpp \
+	$(DIR)/SphereHarm.cpp
 
 VDW_FILES= \
 	amber99.vdw \
@@ -120,7 +133,7 @@ forcer$(EXE) : $(OBJS)
 all: forcer
 
 forcer$(EXE) : $(OBJS)
-	$(CXX) $(CFLAGS) $(OBJS) -o $@ $(LDFLAGS) $(LDADD)
+	$(CXX) $(CFLAGS) $(OBJS) -o $@ $(LDFLAGS) $(LDADD) $(FFTWLIB)
                                                                                                                                                             
 install : $(FORCER)
 	$(MKINSTALLDIRS) $(SHAPES_HOME)/bin