Commit fe013c16 authored by Tollef Fog Heen's avatar Tollef Fog Heen

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: http://www.varnish-cache.org/svn/trunk/varnish-cache@3217 d4fa192b-c00b-0410-8231-f00ffab90ce4
parent c7632339
...@@ -6,3 +6,6 @@ SUBDIRS = \ ...@@ -6,3 +6,6 @@ SUBDIRS = \
libvarnishcompat \ libvarnishcompat \
libvcl \ libvcl \
@JEMALLOC_SUBDIR@ @JEMALLOC_SUBDIR@
DIST_SUBDIRS = $(SUBDIRS) \
libjemalloc
...@@ -10,18 +10,9 @@ libjemalloc_mt_la_LIBADD = ${PTHREAD_LIBS} ...@@ -10,18 +10,9 @@ libjemalloc_mt_la_LIBADD = ${PTHREAD_LIBS}
libjemalloc_mt_la_LDFLAGS = -version-info 0:0:0 -static libjemalloc_mt_la_LDFLAGS = -version-info 0:0:0 -static
libjemalloc_mt_la_CFLAGS = -D__isthreaded=true 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 EXTRA_DIST = malloc.3 \
# gcc $(CFLAGS) -c -DPIC -fPIC $(CPPFLAGS) -D__isthreaded=false -o $@ $+ malloc.c \
README
#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
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment