[Assorted-commits] SF.net SVN: assorted:[1292] ydb/trunk/src/Makefile

[<yan...@us...>]

Revision: 1292
          http://assorted.svn.sourceforge.net/assorted/?rev=1292&view=rev
Author:   yangzhang
Date:     2009-03-13 19:26:26 +0000 (Fri, 13 Mar 2009)

Log Message:
-----------
integrated tpcc into build

Modified Paths:
--------------
    ydb/trunk/src/Makefile

Modified: ydb/trunk/src/Makefile
===================================================================
--- ydb/trunk/src/Makefile	2009-03-13 19:26:08 UTC (rev 1291)
+++ ydb/trunk/src/Makefile	2009-03-13 19:26:26 UTC (rev 1292)
@@ -15,9 +15,12 @@
 GENSRCS  := $(LZZSRCS) $(PBSRCS)
 GENOBJS  := $(LZZOBJS) $(PBOBJS)
 
+TPCC_OBJS:= clock randomgenerator tpccclient tpccdb tpccgenerator tpcctables
+TPCC_OBJS:= $(foreach i,$(TPCC_OBJS),tpcc/$(i).o)
+
 HDRS     := $(GENHDRS)
 SRCS     := $(GENSRCS)
-OBJS     := $(GENOBJS)
+OBJS     := $(GENOBJS) $(TPCC_OBJS)
 
 ifneq ($(GPROF),)
 	GPROF  := -pg
@@ -96,7 +99,12 @@
 %.pb.o: %.pb.cc %.pb.h
 	$(CXX) -c $(PBCXXFLAGS) $(OUTPUT_OPTION) $<
 
-%.o: %.cc $(PBHDRS)
+main.o: main.cc $(PBHDRS)
+
+tpcc/%.o: tpcc/%.cc
+	make -C tpcc/
+
+%.o: %.cc
 	$(COMPILE.cc) $(OUTPUT_OPTION) $<
 
 %.cc %.hh: %.lzz


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.