From e40734630037c6121b63b2644324e25e8c26cd9a Mon Sep 17 00:00:00 2001
From: pancake <pancake@nopcode.org>
Date: Wed, 1 May 2013 01:43:35 +0200
Subject: [PATCH] Fix shlr/ sdb-sync

---
 shlr/Makefile              |  5 +++-
 shlr/sdb/Makefile          |  2 ++
 shlr/sdb/config.mk         |  2 +-
 shlr/sdb/config.mkfoo      | 54 ++++++++++++++++++++++++++++++++++++++
 shlr/sdb/memcache/Makefile |  2 +-
 shlr/sdb/test/Makefile     |  1 +
 6 files changed, 63 insertions(+), 3 deletions(-)
 create mode 100644 shlr/sdb/config.mkfoo
 create mode 100644 shlr/sdb/test/Makefile

diff --git a/shlr/Makefile b/shlr/Makefile
index c3b0439dd0..d8a7111e0b 100644
--- a/shlr/Makefile
+++ b/shlr/Makefile
@@ -27,6 +27,9 @@ sdb-sync sync-sdb:
 	cd sdb ; ${MAKE} src/sdb-version.h
 	cp -f sdb/src/*.h $I/sdb
 	echo '#include <sdb/sdb.h>' > $I/sdb.h
-	mkdir -p sdb/memcache && echo all: > sdb/memcache/Makefile
+	mkdir -p sdb/test sdb/memcache
+	sed -e 's,HAVE_VALA=,HAVE_VALA=#,' -i foo sdb/config.mk
+	echo all clean mrproper: > sdb/memcache/Makefile
+	echo all clean mrproper: > sdb/test/Makefile
 	git add $I/sdb*
 	git add sdb
diff --git a/shlr/sdb/Makefile b/shlr/sdb/Makefile
index b7317b8c69..fc644c89e9 100644
--- a/shlr/sdb/Makefile
+++ b/shlr/sdb/Makefile
@@ -27,7 +27,9 @@ clean:
 	cd src && ${MAKE} clean
 	cd memcache && ${MAKE} clean
 	cd test && ${MAKE} clean
+ifneq (${HAVE_VALA},)
 	cd ${VALADIR} && ${MAKE} clean
+endif
 
 dist:
 	rm -f sdb-${VERSION}.tar.gz
diff --git a/shlr/sdb/config.mk b/shlr/sdb/config.mk
index 9a6deb1655..445dea8ef3 100644
--- a/shlr/sdb/config.mk
+++ b/shlr/sdb/config.mk
@@ -10,7 +10,7 @@ CFLAGS+=-Wall
 #CFLAGS+=-O3
 #CFLAGS+=-ggdb -g -Wall -O0
 
-HAVE_VALA=$(shell valac --version 2> /dev/null)
+HAVE_VALA=#$(shell valac --version 2> /dev/null)
 # This is hacky
 HOST_CC?=gcc
 RANLIB?=ranlib
diff --git a/shlr/sdb/config.mkfoo b/shlr/sdb/config.mkfoo
new file mode 100644
index 0000000000..9a6deb1655
--- /dev/null
+++ b/shlr/sdb/config.mkfoo
@@ -0,0 +1,54 @@
+DESTDIR?=
+PREFIX?=/usr
+
+VERSION=0.6.2
+
+CFLAGS_STD?=-D_POSIX_C_SOURCE=200809L -D_XOPEN_SOURCE=700
+CFLAGS+=${CFLAGS_STD}
+
+CFLAGS+=-Wall
+#CFLAGS+=-O3
+#CFLAGS+=-ggdb -g -Wall -O0
+
+HAVE_VALA=$(shell valac --version 2> /dev/null)
+# This is hacky
+HOST_CC?=gcc
+RANLIB?=ranlib
+OS?=$(shell uname)
+ARCH?=$(shell uname -m)
+
+ifeq (${OS},w32)
+WCP?=i386-mingw32
+CC=${WCP}-gcc
+AR?=${WCP}-ar
+CFLAGS_SHARED?=-fPIC -shared
+EXEXT=.exe
+else
+CFLAGS_SHARED?=-fPIC -shared -fvisibility=hidden
+CC?=gcc
+EXEXT=
+endif
+
+# create .d files
+CFLAGS+=-MMD
+
+ifeq (${OS},Darwin)
+SOEXT=dylib
+LDFLAGS+=-dynamic
+LDFLAGS_SHARED?=-fPIC -shared
+ ifeq (${ARCH},i386)
+   #CC+=-arch i386 
+   CC+=-arch x86_64
+ endif
+else
+SOVERSION=0
+SOEXT=so.0.0.0
+LDFLAGS_SHARED?=-fPIC -shared
+LDFLAGS_SHARED+=-Wl,-soname,libsdb.so.$(SOVERSION)
+endif
+
+ifeq ($(MAKEFLAGS),s)
+SILENT=1
+else
+SILENT=
+endif
diff --git a/shlr/sdb/memcache/Makefile b/shlr/sdb/memcache/Makefile
index 1263948fb8..6b0684547e 100644
--- a/shlr/sdb/memcache/Makefile
+++ b/shlr/sdb/memcache/Makefile
@@ -1 +1 @@
-all:
+all clean mrproper:
diff --git a/shlr/sdb/test/Makefile b/shlr/sdb/test/Makefile
new file mode 100644
index 0000000000..6b0684547e
--- /dev/null
+++ b/shlr/sdb/test/Makefile
@@ -0,0 +1 @@
+all clean mrproper: