From 686d438b15368efd2badac6bb191fd75b5b38dad Mon Sep 17 00:00:00 2001 From: tfheen Date: Wed, 24 Sep 2008 13:21:18 +0000 Subject: [PATCH] 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 git-svn-id: svn+ssh://projects.linpro.no/svn/varnish/trunk@3217 d4fa192b-c00b-0410-8231-f00ffab90ce4 --- varnish-cache/lib/Makefile.am | 3 +++ varnish-cache/lib/libjemalloc/Makefile.am | 19 +++++-------------- 2 files changed, 8 insertions(+), 14 deletions(-) diff --git a/varnish-cache/lib/Makefile.am b/varnish-cache/lib/Makefile.am index e757b3d1..488d20b1 100644 --- a/varnish-cache/lib/Makefile.am +++ b/varnish-cache/lib/Makefile.am @@ -6,3 +6,6 @@ SUBDIRS = \ libvarnishcompat \ libvcl \ @JEMALLOC_SUBDIR@ + +DIST_SUBDIRS = $(SUBDIRS) \ + libjemalloc diff --git a/varnish-cache/lib/libjemalloc/Makefile.am b/varnish-cache/lib/libjemalloc/Makefile.am index 1deecde3..47cad7c0 100644 --- a/varnish-cache/lib/libjemalloc/Makefile.am +++ b/varnish-cache/lib/libjemalloc/Makefile.am @@ -10,18 +10,9 @@ libjemalloc_mt_la_LIBADD = ${PTHREAD_LIBS} 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 -- 2.39.5