ev_reader and ev_writer now own the FDs you give them. This is

[disorder] / lib / Makefile.am

diff --git a/lib/Makefile.am b/lib/Makefile.am
index 212b1ce015a0107932650f793b5f2a3f6910a941..dc6518d27a3ca0a9f323a6958b42267c3c564c1b 100644 (file)
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -36,7 +36,10 @@ libdisorder_a_SOURCES=charset.c charset.h            \
        eventlog.c eventlog.h                           \
        filepart.c filepart.h                           \
        hash.c hash.h                                   \
+       heap.h                                          \
        hex.c hex.h                                     \
+       html.c html.h                                   \
+       ifreq.c ifreq.h                                 \
        inputline.c inputline.h                         \
        kvp.c kvp.h                                     \
        log.c log.h log-impl.h                          \
@@ -53,7 +56,7 @@ libdisorder_a_SOURCES=charset.c charset.h             \
        selection.c selection.h                         \
        signame.c signame.h                             \
        sink.c sink.h                                   \
-       speaker.c speaker.h                             \
+       speaker-protocol.c speaker-protocol.h           \
        split.c split.h                                 \
        syscalls.c syscalls.h                           \
        types.h                                         \
@@ -61,10 +64,12 @@ libdisorder_a_SOURCES=charset.c charset.h           \
        timeval.h                                       \
        trackname.c trackname.h                         \
        user.h user.c                                   \
+       unidata.h unidata.c                             \
        utf8.h utf8.c                                   \
        vacopy.h                                        \
        vector.c vector.h                               \
-       words.c words.h casefold.h unicodegc.h          \
+       wav.h wav.c                                     \
+       words.c words.h                                 \
        wstat.c wstat.h                                 \
        disorder.h
 
@@ -77,7 +82,9 @@ definitions.h: Makefile
        echo "#define SBINDIR \"${sbindir}/\"" >> $@.new
        echo "#define BINDIR \"${bindir}/\"" >> $@.new
        echo "#define FINKBINDIR \"${finkbindir}/\"" >> $@.new
-       mv $@.new $@
+       @if cmp $@.new $@; then \
+               echo rm -f $@.new; rm -f $@.new; else \
+               echo mv $@.new $@; mv $@.new $@; fi
 defs.o: definitions.h
 defs.lo: definitions.h
 
@@ -85,7 +92,11 @@ test_SOURCES=test.c
 test_LDADD=libdisorder.a $(LIBPCRE) $(LIBICONV)
 test_DEPENDENCIES=libdisorder.a
 
-check: test
+check: test #test.i
        ./test
 
-CLEANFILES=definitions.h
+%.i: %.c
+       $(CPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) -c $< > $@.new
+       mv $@.new $@
+
+CLEANFILES=definitions.h definitions.h.new