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

Comparing trunk/SHAPES/Makefile (file contents):
Revision 1300 by gezelter, Thu Jun 24 19:06:47 2004 UTC vs.
Revision 1360 by gezelter, Tue Jul 20 20:02:15 2004 UTC

# Line 49 | Line 49 | FFTWINC = -I/usr/local/include
49  
50   # fftw library and include files
51   FFTWINC = -I/usr/local/include
52 < FFTWLIB = -L/usr/local/lib/ -lfftw3
52 > FFTWLIB = -Wl,-R/usr/local/lib -L/usr/local/lib/ -lfftw3
53  
54 + # cgicc library and include files
55 + CGICCINC = -I/usr/local/include
56 + CGICCLIB = -Wl,-R/usr/local/lib -L/usr/local/lib/ -lcgicc
57 +
58   # CPP flags
59   CPPFLAGS=
60  
# Line 79 | Line 83 | VISUALIZER=visualizer$(EXE)
83  
84   SHAPER=shaper$(EXE)
85   VISUALIZER=visualizer$(EXE)
86 < LDADD=-lz
86 > LDADD=
87  
88   # Then do the compile rules:
89  
# Line 102 | Line 106 | SHAPER_C_FILES = \
106          $(DIR)/seminaive.c \
107          $(DIR)/FST_semi_memo.c
108  
109 + SHAPERCGI_C_FILES = \
110 +        $(DIR)/MatVec3.c \
111 +        $(DIR)/cospmls.c \
112 +        $(DIR)/makeweights.c \
113 +        $(DIR)/naive_synthesis.c \
114 +        $(DIR)/pmls.c \
115 +        $(DIR)/primitive.c \
116 +        $(DIR)/seminaive.c \
117 +        $(DIR)/FST_semi_memo.c
118 +
119   VISUALIZER_C_FILES = \
120          $(DIR)/visualizerCmd.c
121  
# Line 113 | Line 127 | SHAPER_CXX_FILES = \
127          $(DIR)/GridBuilder.cpp \
128          $(DIR)/SphereHarm.cpp
129  
130 + SHAPERCGI_CXX_FILES = \
131 +        $(DIR)/shaperCGI.cpp \
132 +        $(DIR)/PDBReader.cpp \
133 +        $(DIR)/RigidBody.cpp \
134 +        $(DIR)/VDWAtom.cpp \
135 +        $(DIR)/GridBuilder.cpp \
136 +        $(DIR)/SphereHarm.cpp
137 +
138   VISUALIZER_CXX_FILES = \
139          $(DIR)/SHFunc.cpp \
140          $(DIR)/SHAPE.cpp \
# Line 129 | Line 151 | SHAPER_SRCS     :=     $(SHAPER_C_SRCS) $(SHAPER_CXX_S
151   SHAPER_C_SRCS   :=     $(SHAPER_C_FILES)
152   SHAPER_CXX_SRCS :=      $(SHAPER_CXX_FILES)
153   SHAPER_SRCS     :=     $(SHAPER_C_SRCS) $(SHAPER_CXX_SRCS)
154 + SHAPERCGI_C_SRCS   :=     $(SHAPERCGI_C_FILES)
155 + SHAPERCGI_CXX_SRCS :=   $(SHAPERCGI_CXX_FILES)
156 + SHAPERCGI_SRCS     :=     $(SHAPERCGI_C_SRCS) $(SHAPERCGI_CXX_SRCS)
157   VISUALIZER_C_SRCS   :=     $(VISUALIZER_C_FILES)
158   VISUALIZER_CXX_SRCS :=  $(VISUALIZER_CXX_FILES)
159   VISUALIZER_SRCS     :=     $(VISUALIZER_C_SRCS) $(VISUALIZER_CXX_SRCS)
# Line 137 | Line 162 | SHAPER_OBJS     :=     $(SHAPER_C_OBJS) $(SHAPER_CXX_O
162   SHAPER_C_OBJS   :=     $(SHAPER_C_FILES:.c=.o)
163   SHAPER_CXX_OBJS :=      $(SHAPER_CXX_FILES:.cpp=.o)
164   SHAPER_OBJS     :=     $(SHAPER_C_OBJS) $(SHAPER_CXX_OBJS)
165 + SHAPERCGI_C_OBJS   :=     $(SHAPERCGI_C_FILES:.c=.o)
166 + SHAPERCGI_CXX_OBJS :=   $(SHAPERCGI_CXX_FILES:.cpp=.o)
167 + SHAPERCGI_OBJS     :=     $(SHAPERCGI_C_OBJS) $(SHAPERCGI_CXX_OBJS)
168   VISUALIZER_C_OBJS   :=     $(VISUALIZER_C_FILES:.c=.o)
169   VISUALIZER_CXX_OBJS :=  $(VISUALIZER_CXX_FILES:.cpp=.o)
170   VISUALIZER_OBJS     :=     $(VISUALIZER_C_OBJS) $(VISUALIZER_CXX_OBJS)
# Line 145 | Line 173 | SUBDIRS = obj
173  
174   # Possible make targets:
175  
176 < all: shaper visualizer
176 > all: shaper visualizer shaperCGI
177  
178   shaper$(EXE) : $(SHAPER_OBJS)
179          $(CXX) $(CFLAGS) $(SHAPER_OBJS) -o $@ $(LDFLAGS) $(LDADD) $(FFTWLIB)
180                                                                                                                                                              
181 + shaperCGI$(EXE) : $(SHAPERCGI_OBJS)
182 +        $(CXX) $(CFLAGS) $(SHAPERCGI_OBJS) -o $@ $(LDFLAGS) $(LDADD) $(FFTWLIB)  $(CGICCLIB)
183 +                                                                                                                                                            
184   visualizer$(EXE) : $(VISUALIZER_OBJS)
185          $(CXX) $(CFLAGS) $(VISUALIZER_OBJS) -o $@ $(LDFLAGS) $(LDADD)
186                                                                                                                                                              
187 < install : $(SHAPER) $(VISUALIZER)
187 > install : $(SHAPER) $(VISUALIZER) $(SHAPERCGI)
188          $(MKINSTALLDIRS) $(SHAPES_HOME)/bin
189          $(INSTALL_PROGRAM) -s $(SHAPER) $(SHAPES_HOME)/bin/$(SHAPER)
190 +        $(INSTALL_PROGRAM) -s $(SHAPERCGI) $(SHAPES_HOME)/bin/$(SHAPERCGI)
191          $(INSTALL_PROGRAM) -s $(VISUALIZER) $(SHAPES_HOME)/bin/$(VISUALIZER)
192          $(MKINSTALLDIRS) $(VDW_PARAM_DIR)
193          for i in $(VDW_FILES); do \
# Line 183 | Line 215 | Make.dep :
215   Make.dep :
216          echo "Only C dependencies are made automagically!"
217          echo "# DO NOT DELETE THIS LINE - used by make depend" > Make.dep
218 <        $(CC) $(DEPFLAGS) -MM $(SHAPER_C_SRCS) $(VISUALIZER_C_SRCS) \
218 >        $(CC) $(DEPFLAGS) -MM $(SHAPER_C_SRCS) $(VISUALIZER_C_SRCS) $(SHAPERCGI_C_SRCS) \
219                  | sed 's/\.o:/\$$(O)\ :/g' > Make.temp
220 <        $(CXX) $(DEPFLAGS) -MM $(SHAPER_CXX_SRCS) $(VISUALIZER_CXX_SRCS) \
220 >        $(CXX) $(DEPFLAGS) -MM $(SHAPER_CXX_SRCS) $(VISUALIZER_CXX_SRCS) $(SHAPERCGI_CXX_SRCS) \
221                  | sed 's/\.o:/\$$(O)\ :/g' >> Make.temp
222          cat Make.temp | sed 's/^[a-zA-Z0-9]/obj\/&/g' >> Make.dep
223          $(RM) Make.temp

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines