chiark
/
gitweb
/
~mdw
/
disorder
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
mention heap.h in makefile so it is distributed
[disorder]
/
lib
/
Makefile.am
diff --git
a/lib/Makefile.am
b/lib/Makefile.am
index 145b3af17ac2cd7c86d275faffb30dfbc43a1388..4193315498f0b2ad71167cdabdff12bc2fbf9aa8 100644
(file)
--- a/
lib/Makefile.am
+++ b/
lib/Makefile.am
@@
-1,6
+1,6
@@
#
# This file is part of DisOrder.
#
# 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
#
# 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
#
# USA
#
-
lib_LTLIBRARIES=libdisorder.l
a
+
noinst_LIBRARIES=libdisorder.
a
include_HEADERS=disorder.h
noinst_PROGRAMS=test
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 \
addr.c addr.h \
authhash.c authhash.h \
basen.c basen.h \
@@
-39,6
+36,7
@@
libdisorder_la_SOURCES=charset.c charset.h \
eventlog.c eventlog.h \
filepart.c filepart.h \
hash.c hash.h \
eventlog.c eventlog.h \
filepart.c filepart.h \
hash.c hash.h \
+ heap.h \
hex.c hex.h \
inputline.c inputline.h \
kvp.c kvp.h \
hex.c hex.h \
inputline.c inputline.h \
kvp.c kvp.h \
@@
-52,6
+50,7
@@
libdisorder_la_SOURCES=charset.c charset.h \
asprintf.c fprintf.c snprintf.c \
queue.c queue.h \
regsub.c regsub.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 \
selection.c selection.h \
signame.c signame.h \
sink.c sink.h \
@@
-60,6
+59,7
@@
libdisorder_la_SOURCES=charset.c charset.h \
syscalls.c syscalls.h \
types.h \
table.c table.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 \
trackname.c trackname.h \
user.h user.c \
utf8.h utf8.c \
@@
-68,9
+68,6
@@
libdisorder_la_SOURCES=charset.c charset.h \
words.c words.h casefold.h unicodegc.h \
wstat.c wstat.h \
disorder.h
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
definitions.h: Makefile
rm -f $@.new
@@
-78,15
+75,22
@@
definitions.h: Makefile
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
+ echo "#define SBINDIR \"${sbindir}/\"" >> $@.new
+ echo "#define BINDIR \"${bindir}/\"" >> $@.new
+ echo "#define FINKBINDIR \"${finkbindir}/\"" >> $@.new
mv $@.new $@
defs.o: definitions.h
defs.lo: definitions.h
test_SOURCES=test.c
mv $@.new $@
defs.o: definitions.h
defs.lo: definitions.h
test_SOURCES=test.c
-test_LDADD=libdisorder.
la $(LIBPCRE
)
-test_DEPENDENCIES=libdisorder.
l
a
+test_LDADD=libdisorder.
a $(LIBPCRE) $(LIBICONV
)
+test_DEPENDENCIES=libdisorder.a
-check: test
+check: test
#test.i
./test
./test
+%.i: %.c
+ $(CPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) -c $< > $@.new
+ mv $@.new $@
+
CLEANFILES=definitions.h
CLEANFILES=definitions.h