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

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

Revision: 1321
          http://assorted.svn.sourceforge.net/assorted/?rev=1321&view=rev
Author:   yangzhang
Date:     2009-03-22 09:06:24 +0000 (Sun, 22 Mar 2009)

Log Message:
-----------
- cleaned up build, fixed distcc arch issues
- restored unsetprefs.h; somehow that got clobbered

Modified Paths:
--------------
    ydb/trunk/src/Makefile
    ydb/trunk/src/unsetprefs.h

Modified: ydb/trunk/src/Makefile
===================================================================
--- ydb/trunk/src/Makefile	2009-03-21 23:23:39 UTC (rev 1320)
+++ ydb/trunk/src/Makefile	2009-03-22 09:06:24 UTC (rev 1321)
@@ -1,10 +1,18 @@
 TARGET   := ydb
 WTF      := wtf
 CCACHE   := ccache
+DISTCC   := distcc
+CCACHE_PREFIX := $(DISTCC)
+ifeq ($(CCACHE),)
+ACCEL    := $(DISTCC)
+else
+ACCEL    := $(CCACHE)
+endif
 
 CLAMPS   := $(wildcard *.lzz.clamp)
+CLAMPLZZS:= $(patsubst %.clamp,%,$(CLAMPS))
 PURELZZS := $(foreach lzz,$(wildcard *.lzz),$(if $(wildcard $(lzz).clamp),,$(lzz)))
-LZZS     := $(patsubst %.clamp,%,$(CLAMPS)) $(PURELZZS)
+LZZS     := $(CLAMPLZZS) $(PURELZZS)
 LZZHDRS  := $(foreach lzz,$(LZZS),$(patsubst %.lzz,%.hh,$(lzz)))
 LZZSRCS  := $(foreach lzz,$(LZZS),$(patsubst %.lzz,%.cc,$(lzz)))
 LZZOBJS  := $(foreach lzz,$(LZZS),$(patsubst %.lzz,%.o,$(lzz)))
@@ -40,7 +48,7 @@
 	OPT    := -g3
 endif
 # CXX      := $(WTF) ag++ -k --Xcompiler # $(CXX)
-CXX      := $(WTF) $(CCACHE) $(CXX) -pipe
+CXX      := $(WTF) $(ACCEL) $(CXX) -pipe
 CC       := $(CXX) # for linking
 LDFLAGS  := -pthread $(GPROF)
 LDLIBS   := -lstx -lst -lresolv -lprotobuf -lgtest \
@@ -78,7 +86,8 @@
 	-Wlong-long \
 	-Wvolatile-register-var \
 	-std=gnu++0x \
-	-march=native \
+	-m64 \
+	-march=$(shell gcc-config march) \
 	$(CXXFLAGS)
 
 	# \
@@ -93,9 +102,9 @@
 	-Wstrict-overflow \
 	-Winline \
 
-ifeq ($(NPCH),)
+ifneq ($(PCH),)
 	CXXFLAGS := $(CXXFLAGS0) -include pch.h
-%.o: pch.h.gch
+$(LZZOBJS): pch.h.gch
 else
 	CXXFLAGS := $(CXXFLAGS0)
 endif
@@ -140,7 +149,7 @@
 	chmod -w $@
 
 pch.h:
-	svn ls -rHEAD -R | \
+	svn ls -rHEAD -R https://assorted.svn.sourceforge.net/svnroot/assorted/ydb/trunk/src | \
 	egrep -v '/$$|Makefile' | \
 	xargs sed 's/.*\binclude\b  *<\(.*\)>.*/\#include <\1>/; t succ; d; :succ /commons/ d' | \
 	sort -u > $@
@@ -151,8 +160,7 @@
 
 clean:
 	rm -rf clamp/ $(GENSRCS) $(GENHDRS) $(OBJS) $(TARGET) \
-		main.lzz ydb.lzz main.cc main.hh ydb.hh ydb.cc \
-		util.cc util.hh tpcc.lzz tpcc.hh tpcc.cc
+		$(CLAMPLZZS) $(LZZHDRS) $(LZZSRCS)
 	make -C tpcc/ clean
 
 distclean: clean

Modified: ydb/trunk/src/unsetprefs.h
===================================================================
--- ydb/trunk/src/unsetprefs.h	2009-03-21 23:23:39 UTC (rev 1320)
+++ ydb/trunk/src/unsetprefs.h	2009-03-22 09:06:24 UTC (rev 1321)
@@ -0,0 +1,5 @@
+#undef function
+#undef shared_ptr
+#undef ref
+#undef tuple
+#undef make_tuple


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