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

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

Revision: 1333
          http://assorted.svn.sourceforge.net/assorted/?rev=1333&view=rev
Author:   yangzhang
Date:     2009-03-24 09:26:20 +0000 (Tue, 24 Mar 2009)

Log Message:
-----------
more clean-up

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

Modified: ydb/trunk/src/Makefile
===================================================================
--- ydb/trunk/src/Makefile	2009-03-24 09:11:22 UTC (rev 1332)
+++ ydb/trunk/src/Makefile	2009-03-24 09:26:20 UTC (rev 1333)
@@ -97,11 +97,13 @@
 
 SVNURL   := https://assorted.svn.sourceforge.net/svnroot/assorted/ydb/trunk/src
 TARGET   := ydb
+TARGETS  := ser p2 serperf
 
 CLAMPLZZS:= $(wildcard *.clamp.lzz)
-CLAMPS   := $(foreach lzz,$(CLAMPLZZS),$(patsubst %.clamp.lzz,%.hh.clamp,$(lzz))) \
-            $(foreach lzz,$(CLAMPLZZS),$(patsubst %.clamp.lzz,%.cc.clamp,$(lzz)))
-CLAMPOUTS:= $(foreach clamp,$(CLAMPS),$(patsubst %.clamp,%,$(clamp)))
+CLAMPS   := $(foreach lzz,$(CLAMPLZZS),$(patsubst %.lzz,%,$(lzz)))
+LZZOUTS  := $(foreach lzz,$(CLAMPS),$(patsubst %.clamp,%.hh.clamp,$(lzz))) \
+            $(foreach lzz,$(CLAMPS),$(patsubst %.clamp,%.cc.clamp,$(lzz)))
+CLAMPOUTS:= $(foreach clamp,$(LZZOUTS),$(patsubst %.clamp,%,$(clamp)))
 
 PBS      := $(wildcard *.proto)
 PBOUTS   := $(foreach pb,$(PBS),$(patsubst %.proto,%.pb.h,$(pb))) \
@@ -137,12 +139,15 @@
 %.pb.h %.pb.cc: %.proto
 	protoc --cpp_out=. $<
 
-%.cc.clamp %.hh.clamp: %.clamp.lzz
-	ln -sf $< $(basename $<)
-	rm -f $(basename $(basename $<)).{hh,cc}.clamp
-	lzz -hx hh.clamp -sx cc.clamp -hd -sd $(basename $<)
-	chmod -w $(basename $(basename $<)).{hh,cc}.clamp
+%.clamp: %.clamp.lzz
+	ln -sf $< $@
+	chmod -w $@
 
+%.cc.clamp %.hh.clamp: %.clamp
+	rm -f $(basename $<).{hh,cc}.clamp
+	lzz -hx hh.clamp -sx cc.clamp -hd -sd $<
+	chmod -w $(basename $<).{hh,cc}.clamp
+
 %.cc: %.cc.clamp
 	rm -f $@
 	mkdir -p .clamp/
@@ -188,13 +193,10 @@
 	-Wno-unused-parameter
 
 clean:
-	rm -rf $(GENOUTS) $(OBJS) $(TARGET) $(CLAMPLZZS) .clamp/ *.d
+	rm -rf $(GENOUTS) $(OBJS) $(TARGET) $(TARGETS) $(CLAMPS) $(LZZOUTS) pch.h pch.h.gch .clamp/ *.d tpcc/*.d deps.mk
 
-distclean: clean
-	rm -f pch.h pch.h.gch
+.SECONDARY: $(GENOUTS) $(OBJS) $(CLAMPS) $(LZZOUTS) pch.h pch.h.gch
 
-.SECONDARY: $(GENOUTS) $(OBJS) pch.h.gch
-
 serperf: ydb.pb.o
 ser: ydb.pb.o
 


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