ViewVC Help
View File | Revision Log | Show Annotations | View Changeset | Root Listing
root/group/trunk/OOPSE-1.0/utils/sysbuilder/Makefile.in
(Generate patch)

Comparing trunk/OOPSE-1.0/utils/sysbuilder/Makefile.in (file contents):
Revision 1443 by tim, Fri Jul 30 14:44:10 2004 UTC vs.
Revision 1446 by tim, Fri Jul 30 15:39:04 2004 UTC

# Line 222 | Line 222 | DIR:=obj
222   #the objects
223  
224   DIR:=obj
225 <
226 < #SYSBUILD_C_OBJS := $(SYSBUILD_C_FILES:.c=.o)
227 < #SYSBUILD_CXX_OBJS := $(SYSBUILD_CXX_FILES:.cpp=.o)
228 < #SYSBUILD_OBJS := $(SYSBUILD_C_OBJS) $(SYSBUILD_CXX_OBJS)
229 <
230 < #LBILAYER_CXX_OBJS := $(LBILAYER_CXX_FILES:.cpp=.o)
231 < #LBILAYER_OBJS := $(LBILAYER_CXX_OBJS)
232 < #LIB_OBJS      := $(LIBOBJS:%.o=  ../$(DIR)/%.o)
233 <
234 < #RBILAYER_CXX_OBJS := $(RBILAYER_CXX_FILES:.cpp=.o)
235 < #RBILAYER_OBJS := $(RBILAYER_CXX_OBJS)
225 > LIB_OBJS      := $(LIBOBJS:%.o=  ../$(DIR)/%.o)
226  
227   BUILDER_LIB_CXX_OBJS := $(BUILDER_LIB_CXX_FILES:.cpp=.o)
228   BUILDER_LIB_OBJS := $(BUILDER_LIB_CXX_OBJS)
# Line 248 | Line 238 | depend: Make.dep
238  
239   depend: Make.dep
240  
251 #sysBuild$(EXE) : $(SYSBUILD_OBJS) $(BASS_LIB) $(MD_LIB)
252 #       $(CXX) $(CXXFLAGS) $(SYSBUILD_OBJS) -o $@ $(SYSBUILD_LDFLAGS) $(SYSBUILD_LDADD)
241  
254
242   libBuilder.a: $(BUILDER_LIB_OBJS)
243          $(RM) $@
244          $(AR) cr $@ $(BUILDER_LIB_OBJS)
# Line 259 | Line 246 | simpleBuilder$(EXE): $(SIMPLEBUILD_OBJS) $(BUILDER_LIB
246  
247  
248   simpleBuilder$(EXE): $(SIMPLEBUILD_OBJS) $(BUILDER_LIB)  $(BASS_LIB) $(MD_LIB) $(LIB_OBJS)
249 <        $(CXX) $(CXXFLAGS) $(SIMPLEBUILD_OBJS) $(BUILDER_LIB_OBJS) -o $@ $(SIMPLEBUILD_LDFLAGS) $(SIMPLEBUILD_LDADD)
249 >        $(CXX) $(CXXFLAGS) $(SIMPLEBUILD_OBJS) $(BUILDER_LIB_OBJS) $(LIB_OBJS) -o $@ $(SIMPLEBUILD_LDFLAGS) $(SIMPLEBUILD_LDADD)
250  
251  
252   install : $(SIMPLEBUILD)

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines