diff options
| author | Jason Evans <jasone@canonware.com> | 2013-01-23 18:32:04 (GMT) |
|---|---|---|
| committer | Jason Evans <jasone@canonware.com> | 2013-01-23 18:32:04 (GMT) |
| commit | 83789f45307379e096c4e8be81d9e9a51e3f5a4a (patch) | |
| tree | f8e39c4489cd99df1ed53475e79a4e5fe76483c2 /Makefile.in | |
| parent | 87499f6748ebe4817571e817e9f680ccb5bf54a9 (diff) | |
| parent | b5681fb20c17478f2193fead19b7788807e39996 (diff) | |
| download | jemalloc-3.3.0.zip jemalloc-3.3.0.tar.gz jemalloc-3.3.0.tar.bz2 | |
Merge branch 'dev'3.3.0
Diffstat (limited to 'Makefile.in')
| -rw-r--r-- | Makefile.in | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/Makefile.in b/Makefile.in index 3644818..7481047 100644 --- a/Makefile.in +++ b/Makefile.in @@ -48,6 +48,7 @@ cfgoutputs_in := @cfgoutputs_in@ cfgoutputs_out := @cfgoutputs_out@ enable_autogen := @enable_autogen@ enable_experimental := @enable_experimental@ +enable_zone_allocator := @enable_zone_allocator@ DSO_LDFLAGS = @DSO_LDFLAGS@ SOREV = @SOREV@ PIC_CFLAGS = @PIC_CFLAGS@ @@ -80,7 +81,7 @@ CSRCS := $(srcroot)src/jemalloc.c $(srcroot)src/arena.c $(srcroot)src/atomic.c \ $(srcroot)src/mutex.c $(srcroot)src/prof.c $(srcroot)src/quarantine.c \ $(srcroot)src/rtree.c $(srcroot)src/stats.c $(srcroot)src/tcache.c \ $(srcroot)src/util.c $(srcroot)src/tsd.c -ifeq (macho, $(ABI)) +ifeq ($(enable_zone_allocator), 1) CSRCS += $(srcroot)src/zone.c endif ifeq ($(IMPORTLIB),$(SO)) @@ -112,9 +113,9 @@ COBJS := $(CSRCS:$(srcroot)%.c=$(objroot)%.$(O)) CPICOBJS := $(CSRCS:$(srcroot)%.c=$(objroot)%.pic.$(O)) CTESTOBJS := $(CTESTS:$(srcroot)%.c=$(objroot)%.$(O)) -.PHONY: all dist doc_html doc_man doc +.PHONY: all dist build_doc_html build_doc_man build_doc .PHONY: install_bin install_include install_lib -.PHONY: install_html install_man install_doc install +.PHONY: install_doc_html install_doc_man install_doc install .PHONY: tests check clean distclean relclean .SECONDARY : $(CTESTOBJS) |