summaryrefslogtreecommitdiffstats
path: root/src/shared/libosmocore/include
diff options
context:
space:
mode:
authorHarald Welte <laforge@gnumonks.org>2010-03-07 20:24:53 +0100
committerHarald Welte <laforge@gnumonks.org>2010-03-07 20:24:53 +0100
commitef956d2ac47fcac7c219728cfba8c9bcec543f7c (patch)
treeb0daeb665f48e6e79945ec6f1aa4331d018d1bd8 /src/shared/libosmocore/include
parent80f20962d3df5209008a5ec9df009635d528ff26 (diff)
parentcbb29f7c94ad2a7cb0ebe7d43cbef5fb9d11d62e (diff)
Merge commit 'cbb29f7c94ad2a7cb0ebe7d43cbef5fb9d11d62e'
Diffstat (limited to 'src/shared/libosmocore/include')
-rw-r--r--src/shared/libosmocore/include/osmocore/Makefile.am6
1 files changed, 5 insertions, 1 deletions
diff --git a/src/shared/libosmocore/include/osmocore/Makefile.am b/src/shared/libosmocore/include/osmocore/Makefile.am
index 9c4fc757..adcae538 100644
--- a/src/shared/libosmocore/include/osmocore/Makefile.am
+++ b/src/shared/libosmocore/include/osmocore/Makefile.am
@@ -1,7 +1,11 @@
-osmocore_HEADERS = signal.h linuxlist.h timer.h talloc.h msgb.h select.h \
+osmocore_HEADERS = signal.h linuxlist.h timer.h select.h msgb.h \
tlv.h bitvec.h comp128.h statistics.h gsm_utils.h utils.h \
gsmtap.h write_queue.h rsl.h gsm48.h rxlev_stat.h
+if ENABLE_TALLOC
+osmocore_HEADERS += talloc.h
+endif
+
osmocoredir = $(includedir)/osmocore
SUBDIRS = protocol