diff options
author | Lennart Poettering <lennart@poettering.net> | 2008-05-01 19:22:35 +0000 |
---|---|---|
committer | Lennart Poettering <lennart@poettering.net> | 2008-05-01 19:22:35 +0000 |
commit | 414f1d956f98e1921a88061dc118795519168d66 (patch) | |
tree | 1807524616f40f7fd42f21261baff29fb98f50d2 | |
parent | d7cc1f5a12cb1cf29879443fe1d151c3747aea04 (diff) |
install gccmacro.h properly, drop unused core-def.h file
git-svn-id: file:///home/lennart/svn/public/pulseaudio/branches/glitch-free@2325 fefdeb5f-60dc-0310-8127-8f9354f1896f
-rw-r--r-- | src/Makefile.am | 10 | ||||
-rw-r--r-- | src/pulsecore/core-def.h | 29 |
2 files changed, 5 insertions, 34 deletions
diff --git a/src/Makefile.am b/src/Makefile.am index 28882085..5cc9546f 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -131,8 +131,7 @@ pulseaudio_SOURCES = \ daemon/daemon-conf.c daemon/daemon-conf.h \ daemon/dumpmodules.c daemon/dumpmodules.h \ daemon/ltdl-bind-now.c daemon/ltdl-bind-now.h \ - daemon/main.c \ - pulsecore/gccmacro.h + daemon/main.c pulseaudio_CFLAGS = $(AM_CFLAGS) $(LIBOIL_CFLAGS) $(LIBSAMPLERATE_CFLAGS) $(LIBSNDFILE_CFLAGS) $(CAP_CFLAGS) $(LIBOIL_CFLAGS) $(DBUS_CFLAGS) pulseaudio_CPPFLAGS = $(AM_CPPFLAGS) @@ -470,7 +469,8 @@ pulseinclude_HEADERS = \ pulse/version.h \ pulse/volume.h \ pulse/xmalloc.h \ - pulse/proplist.h + pulse/proplist.h \ + pulse/gccmacro.h if HAVE_AVAHI pulseinclude_HEADERS += \ @@ -529,7 +529,6 @@ libpulse_la_SOURCES += \ pulsecore/conf-parser.c pulsecore/conf-parser.h \ pulsecore/core-util.c pulsecore/core-util.h \ pulsecore/dynarray.c pulsecore/dynarray.h \ - pulsecore/gccmacro.h \ pulsecore/hashmap.c pulsecore/hashmap.h \ pulsecore/idxset.c pulsecore/idxset.h \ pulsecore/inet_ntop.c pulsecore/inet_ntop.h \ @@ -562,6 +561,8 @@ libpulse_la_SOURCES += \ pulsecore/object.c pulsecore/object.h \ pulsecore/msgobject.c pulsecore/msgobject.h \ pulsecore/once.c pulsecore/once.h \ + pulsecore/rtclock.c pulsecore/rtclock.h \ + pulsecore/time-smoother.c pulsecore/time-smoother.h \ $(PA_THREAD_OBJS) if OS_IS_WIN32 @@ -661,7 +662,6 @@ noinst_HEADERS = \ pulsecore/cli-text.h \ pulsecore/client.h \ pulsecore/core.h \ - pulsecore/core-def.h \ pulsecore/core-scache.h \ pulsecore/core-subscribe.h \ pulsecore/conf-parser.h \ diff --git a/src/pulsecore/core-def.h b/src/pulsecore/core-def.h deleted file mode 100644 index 4bc05137..00000000 --- a/src/pulsecore/core-def.h +++ /dev/null @@ -1,29 +0,0 @@ -#ifndef foocoredefhfoo -#define foocoredefhfoo - -/* $Id$ */ - -/*** - This file is part of PulseAudio. - - Copyright 2006 Pierre Ossman <ossman@cendio.se> for Cendio AB - - PulseAudio is free software; you can redistribute it and/or modify - it under the terms of the GNU Lesser General Public License as published - by the Free Software Foundation; either version 2 of the License, - or (at your option) any later version. - - PulseAudio is distributed in the hope that it will be useful, but - WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU Lesser General Public License - along with PulseAudio; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 - USA. -***/ - -/* FIXME: Remove this shit */ - -#endif |