~mdw
/
disorder
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge Core Audio fixes
[disorder]
/
lib
/
Makefile.am
diff --git
a/lib/Makefile.am
b/lib/Makefile.am
index
9b50089
..
9df1dfd
100644
(file)
--- a/
lib/Makefile.am
+++ b/
lib/Makefile.am
@@
-39,6
+39,7
@@
libdisorder_a_SOURCES=charset.c charset.h \
client-common.c client-common.h \
configuration.c configuration.h \
cookies.c cookies.h \
client-common.c client-common.h \
configuration.c configuration.h \
cookies.c cookies.h \
+ coreaudio.c coreaudio.h \
dateparse.c dateparse.h xgetdate.c \
defs.c defs.h \
eclient.c eclient.h \
dateparse.c dateparse.h xgetdate.c \
defs.c defs.h \
eclient.c eclient.h \
@@
-54,10
+55,10
@@
libdisorder_a_SOURCES=charset.c charset.h \
ifreq.c ifreq.h \
inputline.c inputline.h \
kvp.c kvp.h \
ifreq.c ifreq.h \
inputline.c inputline.h \
kvp.c kvp.h \
- log.c log.h
log-impl.h
\
+ log.c log.h
\
logfd.c logfd.h \
macros.c macros-builtin.c macros.h \
logfd.c logfd.h \
macros.c macros-builtin.c macros.h \
- mem.c mem.h
mem-impl.h
\
+ mem.c mem.h
\
mime.h mime.c \
mixer.c mixer.h mixer-oss.c mixer-alsa.c \
printf.c printf.h \
mime.h mime.c \
mixer.c mixer.h mixer-oss.c mixer-alsa.c \
printf.c printf.h \
@@
-73,6
+74,7
@@
libdisorder_a_SOURCES=charset.c charset.h \
sink.c sink.h \
speaker-protocol.c speaker-protocol.h \
split.c split.h \
sink.c sink.h \
speaker-protocol.c speaker-protocol.h \
split.c split.h \
+ strptime.c strptime.h \
syscalls.c syscalls.h \
common.h \
table.c table.h \
syscalls.c syscalls.h \
common.h \
table.c table.h \
@@
-106,7
+108,12
@@
versionstring.h: version-string ${top_srcdir}/scripts/text2c
definitions.h: Makefile
rm -f $@.new
definitions.h: Makefile
rm -f $@.new
- echo "#define PKGLIBDIR \"${pkglibdir}\"" > $@.new
+ echo "/** @file lib/definitions.h" >> $@.new
+ echo " * @brief Definitions exported from makefile" >> $@.new
+ echo " *" >> $@.new
+ echo " * DO NOT EDIT." >> $@.new
+ echo " */" >> $@.new
+ echo "#define PKGLIBDIR \"${pkglibdir}\"" >> $@.new
echo "#define PKGCONFDIR \"${sysconfdir}/\"PACKAGE" >> $@.new
echo "#define PKGSTATEDIR \"${localstatedir}/\"PACKAGE" >> $@.new
echo "#define PKGDATADIR \"${pkgdatadir}/\"" >> $@.new
echo "#define PKGCONFDIR \"${sysconfdir}/\"PACKAGE" >> $@.new
echo "#define PKGSTATEDIR \"${localstatedir}/\"PACKAGE" >> $@.new
echo "#define PKGDATADIR \"${pkgdatadir}/\"" >> $@.new
@@
-128,6
+135,6
@@
rebuild-unicode:
mv $@.new $@
CLEANFILES=definitions.h definitions.h.new version-string versionstring.h \
mv $@.new $@
CLEANFILES=definitions.h definitions.h.new version-string versionstring.h \
- *.gcda *.gcov *.gcno
+ *.gcda *.gcov *.gcno
*.c.html index.html
EXTRA_DIST=trackdb.c trackdb-stub.c
EXTRA_DIST=trackdb.c trackdb-stub.c