even chattier logging

[disorder] / lib / Makefile.am

diff --git a/lib/Makefile.am b/lib/Makefile.am
index 145b3af17ac2cd7c86d275faffb30dfbc43a1388..e9b41f89055ecf967c745eae5eae5c0b7e6a1359 100644 (file)
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -1,6 +1,6 @@
 #
 # This file is part of DisOrder.
-# Copyright (C) 2004, 2005, 2006 Richard Kettlewell
+# Copyright (C) 2004, 2005, 2006, s007 Richard Kettlewell
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -18,14 +18,11 @@
 # USA
 #
 
-lib_LTLIBRARIES=libdisorder.la
+noinst_LIBRARIES=libdisorder.a
 include_HEADERS=disorder.h
 noinst_PROGRAMS=test
 
-# This library is there to share code between the DisOrder applications,
-# not to provide an interface to anyone else.  As such there are no
-# guarantees regarding its ABI.
-libdisorder_la_SOURCES=charset.c charset.h             \
+libdisorder_a_SOURCES=charset.c charset.h              \
        addr.c addr.h                                   \
        authhash.c authhash.h                           \
        basen.c basen.h                                 \
@@ -39,7 +36,10 @@ libdisorder_la_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                          \
@@ -52,25 +52,25 @@ libdisorder_la_SOURCES=charset.c charset.h          \
        asprintf.c fprintf.c snprintf.c                 \
        queue.c queue.h                                 \
        regsub.c regsub.h                               \
+       rtp.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                                         \
        table.c table.h                                 \
+       timeval.h                                       \
        trackname.c trackname.h                         \
        user.h user.c                                   \
        utf8.h utf8.c                                   \
        vacopy.h                                        \
        vector.c vector.h                               \
+       wav.h wav.c                                     \
        words.c words.h casefold.h unicodegc.h          \
        wstat.c wstat.h                                 \
        disorder.h
-libdisorder_la_LIBADD=$(LIBGCRYPT) $(LIBGC) $(LIBICONV) $(LIBNSL) \
-       $(LIBSOCKET) $(LIBDL) $(LIBPCRE)
-libdisorder_la_LDFLAGS=-release ${VERSION}
 
 definitions.h: Makefile
        rm -f $@.new
@@ -78,15 +78,24 @@ definitions.h: Makefile
        echo "#define PKGCONFDIR \"${sysconfdir}/\"PACKAGE" >> $@.new
        echo "#define PKGSTATEDIR \"${localstatedir}/\"PACKAGE" >> $@.new
        echo "#define PKGDATADIR \"${pkgdatadir}/\"" >> $@.new
-       mv $@.new $@
+       echo "#define SBINDIR \"${sbindir}/\"" >> $@.new
+       echo "#define BINDIR \"${bindir}/\"" >> $@.new
+       echo "#define FINKBINDIR \"${finkbindir}/\"" >> $@.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
 
 test_SOURCES=test.c
-test_LDADD=libdisorder.la $(LIBPCRE)
-test_DEPENDENCIES=libdisorder.la
+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