diff options
| -rw-r--r-- | Makefile.am | 5 | ||||
| -rw-r--r-- | contrib/dlmalloc/Makefile.am | 2 | ||||
| -rw-r--r-- | src/Makefile.am | 4 |
3 files changed, 7 insertions, 4 deletions
diff --git a/Makefile.am b/Makefile.am index 8ab86f6..6a866ba 100644 --- a/Makefile.am +++ b/Makefile.am @@ -2,7 +2,10 @@ # silence libtoolize: ACLOCAL_AMFLAGS = -I m4 -SUBDIRS = lib contrib/dlmalloc contrib/rb3ptr src doc tests +if REPLACE_MALLOC +MAYBE_DLMALLOC = contrib/dlmalloc +endif +SUBDIRS = lib $(MAYBE_DLMALLOC) contrib/rb3ptr src doc tests dist_pkgdata_DATA = sample.teco_ini diff --git a/contrib/dlmalloc/Makefile.am b/contrib/dlmalloc/Makefile.am index 8df52cb..f9e35dd 100644 --- a/contrib/dlmalloc/Makefile.am +++ b/contrib/dlmalloc/Makefile.am @@ -19,6 +19,4 @@ AM_CFLAGS = -fno-optimize-strlen endif noinst_LTLIBRARIES = libdlmalloc.la -if REPLACE_MALLOC libdlmalloc_la_SOURCES = malloc.c malloc.h -endif diff --git a/src/Makefile.am b/src/Makefile.am index 17de739..8441456 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -60,8 +60,10 @@ libsciteco_base_la_SOURCES = main.c sciteco.h list.h \ # NOTE: We cannot link in Scintilla (static library) into # a libtool convenience library libsciteco_base_la_LIBADD = $(LIBSCITECO_INTERFACE) \ - $(top_builddir)/contrib/dlmalloc/libdlmalloc.la \ $(top_builddir)/contrib/rb3ptr/librb3ptr.la +if REPLACE_MALLOC +libsciteco_base_la_LIBADD += $(top_builddir)/contrib/dlmalloc/libdlmalloc.la +endif if BOOTSTRAP noinst_PROGRAMS = sciteco-minimal |