r3217 - in trunk/varnish-cache/lib: . libjemalloc

[tfheen at projects.linpro.no]

Author: tfheen
Date: 2008-09-24 15:21:18 +0200 (Wed, 24 Sep 2008)
New Revision: 3217

Modified:
   trunk/varnish-cache/lib/Makefile.am
   trunk/varnish-cache/lib/libjemalloc/Makefile.am
Log:
Build fixes

* Make sure we distribute the libjemalloc directory.
* Also make sure we distribute rb.h and the rest of the source jemalloc
  came with.
* Get rid of some pre-autoconfiscation code from Makefile.am


Modified: trunk/varnish-cache/lib/Makefile.am
===================================================================
--- trunk/varnish-cache/lib/Makefile.am	2008-09-24 12:41:29 UTC (rev 3216)
+++ trunk/varnish-cache/lib/Makefile.am	2008-09-24 13:21:18 UTC (rev 3217)
@@ -6,3 +6,6 @@
 	libvarnishcompat \
 	libvcl \
 	@JEMALLOC_SUBDIR@
+
+DIST_SUBDIRS = 	$(SUBDIRS) \
+	libjemalloc

Modified: trunk/varnish-cache/lib/libjemalloc/Makefile.am
===================================================================
--- trunk/varnish-cache/lib/libjemalloc/Makefile.am	2008-09-24 12:41:29 UTC (rev 3216)
+++ trunk/varnish-cache/lib/libjemalloc/Makefile.am	2008-09-24 13:21:18 UTC (rev 3217)
@@ -10,18 +10,9 @@
 libjemalloc_mt_la_LDFLAGS = -version-info 0:0:0 -static
 libjemalloc_mt_la_CFLAGS = -D__isthreaded=true
 
-libjemalloc_mt_la_SOURCES = jemalloc_linux.c
+libjemalloc_mt_la_SOURCES = jemalloc_linux.c \
+	rb.h
 
-#jemalloc_linux.o: jemalloc_linux.c
-#	gcc $(CFLAGS) -c -DPIC -fPIC $(CPPFLAGS) -D__isthreaded=false -o $@ $+
-
-#libjemalloc_mt.so.0: jemalloc_linux_mt.o
-#	gcc -shared -lpthread -o $@ $+
-#	ln -sf $@ libjemalloc_mt.so
-
-#libjemalloc.so.0: jemalloc_linux.o
-#	gcc -shared -lpthread -o $@ $+
-#	ln -sf $@ libjemalloc.so
-
-#clean:
-#	rm -f *.o *.so.0 *.so
+EXTRA_DIST = malloc.3 \
+	malloc.c \
+	README