diff options
author | Lennart Poettering <lennart@poettering.net> | 2008-09-08 17:25:16 +0300 |
---|---|---|
committer | Lennart Poettering <lennart@poettering.net> | 2008-09-08 17:25:16 +0300 |
commit | c7a77657ffe00b6d52a0c7e3d29f4fcf8537af5f (patch) | |
tree | 1ac05a5c37df435c164736b684903a926a733b8d /src/Makefile.am | |
parent | 6b034f5bfd4a69d5795f2292014f902fd450a8a4 (diff) | |
parent | 821dc1797faa903618c7585d3c053fd7ae6e93db (diff) |
Merge branch 'master' into master-tx
Diffstat (limited to 'src/Makefile.am')
-rw-r--r-- | src/Makefile.am | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/src/Makefile.am b/src/Makefile.am index a20c7c45..1663d66d 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -541,8 +541,7 @@ libpulse_la_SOURCES = \ pulse/xmalloc.c pulse/xmalloc.h \ pulse/proplist.c pulse/proplist.h \ pulse/ext-stream-restore.c pulse/ext-stream-restore.h \ - pulse/i18n.c pulse/i18n.h \ - pulse/lock-autospawn.c pulse/lock-autospawn.h + pulse/i18n.c pulse/i18n.h # Internal stuff that is shared with libpulsecore libpulse_la_SOURCES += \ @@ -740,8 +739,7 @@ libpulsecore_la_SOURCES = \ pulse/volume.c pulse/volume.h \ pulse/xmalloc.c pulse/xmalloc.h \ pulse/proplist.c pulse/proplist.h \ - pulse/i18n.c pulse/i18n.h \ - pulse/lock-autospawn.c pulse/lock-autospawn.h + pulse/i18n.c pulse/i18n.h # Pure core stuff (some are shared in libpulse though). libpulsecore_la_SOURCES += \ @@ -811,6 +809,7 @@ libpulsecore_la_SOURCES += \ pulsecore/start-child.c pulsecore/start-child.h \ pulsecore/envelope.c pulsecore/envelope.h \ pulsecore/proplist-util.c pulsecore/proplist-util.h \ + pulsecore/lock-autospawn.c pulsecore/lock-autospawn.h \ $(PA_THREAD_OBJS) if OS_IS_WIN32 @@ -1625,7 +1624,7 @@ update-ffmpeg: update-map-file: ( echo "PULSE_0 {" ; \ echo "global:" ; \ - ctags -I PA_GCC_PURE,PA_GCC_CONST,PA_GCC_DEPRECATED,PA_GCC_PRINTF_ATTR -f - --c-kinds=p $(pulseinclude_HEADERS) | awk '/^pa_/ { print $$1 ";" }' | sort ; \ + ctags -I PA_GCC_MALLOC,PA_GCC_ALLOC_SIZE2,PA_GCC_ALLOC_SIZE,PA_GCC_PURE,PA_GCC_CONST,PA_GCC_DEPRECATED,PA_GCC_PRINTF_ATTR -f - --c-kinds=p $(pulseinclude_HEADERS) | awk '/^pa_/ { print $$1 ";" }' | sort ; \ echo "local:" ; \ echo "*;" ; \ echo "};" ) > $(srcdir)/map-file |