Skip to content
This repository has been archived by the owner on Jul 30, 2021. It is now read-only.

Commit

Permalink
Build fixes
Browse files Browse the repository at this point in the history
* 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@3217 d4fa192b-c00b-0410-8231-f00ffab90ce4
  • Loading branch information
Tollef Fog Heen committed Sep 24, 2008
1 parent 30cfdf2 commit 0b259a2
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 14 deletions.
3 changes: 3 additions & 0 deletions lib/Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -6,3 +6,6 @@ SUBDIRS = \
libvarnishcompat \
libvcl \
@JEMALLOC_SUBDIR@

DIST_SUBDIRS = $(SUBDIRS) \
libjemalloc
19 changes: 5 additions & 14 deletions lib/libjemalloc/Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -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

0 comments on commit 0b259a2

Please sign in to comment.