diff options
author | Lennart Poettering <lennart@poettering.net> | 2005-08-15 21:31:30 +0000 |
---|---|---|
committer | Lennart Poettering <lennart@poettering.net> | 2005-08-15 21:31:30 +0000 |
commit | f1167112d926b189fe189599576e8588923f036c (patch) | |
tree | 20d7d4c58594540de8a4771ae78b204bf8a3db16 /avahi-core/Makefile.am | |
parent | 86727e2f97a5e845d462178692c8574d226f22d7 (diff) |
* cleanup build system a little
* strip remaining glib usage
* -fPIC build fix for x86-64 (thanks tvainika)
git-svn-id: file:///home/lennart/svn/public/avahi/trunk@336 941a03a8-eaeb-0310-b9a0-b1bbd8fe43fe
Diffstat (limited to 'avahi-core/Makefile.am')
-rw-r--r-- | avahi-core/Makefile.am | 26 |
1 files changed, 10 insertions, 16 deletions
diff --git a/avahi-core/Makefile.am b/avahi-core/Makefile.am index 71f698e..3c6dbcf 100644 --- a/avahi-core/Makefile.am +++ b/avahi-core/Makefile.am @@ -19,12 +19,6 @@ AM_CFLAGS=-I$(top_srcdir) -# Import stuff from avahi-common -COMMON_LDADD=../avahi-common/libavahi-common.la - -# Import stuff from avahi-glib -GLIB_LDADD=../avahi-glib/libavahi-glib.la - # This cool debug trap works on i386/gcc only AM_CFLAGS+='-DDEBUG_TRAP=__asm__("int $$3")' @@ -77,29 +71,29 @@ libavahi_core_la_SOURCES = \ hashmap.c hashmap.h libavahi_core_la_CFLAGS = $(AM_CFLAGS) -libavahi_core_la_LIBADD = $(AM_LDADD) $(COMMON_LDADD) +libavahi_core_la_LIBADD = $(AM_LDADD) ../avahi-common/libavahi-common.la libavahi_core_la_LDFLAGS = $(AM_LDFLAGS) -export-dynamic -version-info 0:0:0 prioq_test_SOURCES = \ prioq-test.c \ prioq.c prioq.h prioq_test_CFLAGS = $(AM_CFLAGS) -prioq_test_LDADD = $(AM_LDADD) $(COMMON_LDADD) +prioq_test_LDADD = $(AM_LDADD) ../avahi-common/libavahi-common.la avahi_test_SOURCES = \ avahi-test.c -avahi_test_CFLAGS = $(AM_CFLAGS) $(GLIB20_CFLAGS) -avahi_test_LDADD = $(AM_LDADD) $(COMMON_LDADD) libavahi-core.la $(GLIB_LDADD) $(GLIB20_LIBS) +avahi_test_CFLAGS = $(AM_CFLAGS) +avahi_test_LDADD = $(AM_LDADD) ../avahi-common/libavahi-common.la libavahi-core.la conformance_test_SOURCES = \ conformance-test.c -conformance_test_CFLAGS = $(AM_CFLAGS) $(GLIB20_CFLAGS) -conformance_test_LDADD = $(AM_LDADD) $(COMMON_LDADD) libavahi-core.la $(GLIB_LDADD) $(GLIB20_LIBS) +conformance_test_CFLAGS = $(AM_CFLAGS) +conformance_test_LDADD = $(AM_LDADD) ../avahi-common/libavahi-common.la libavahi-core.la avahi_reflector_SOURCES = \ avahi-reflector.c avahi_reflector_CFLAGS = $(AM_CFLAGS) -avahi_reflector_LDADD = $(AM_LDADD) $(COMMON_LDADD) libavahi-core.la +avahi_reflector_LDADD = $(AM_LDADD) ../avahi-common/libavahi-common.la libavahi-core.la dns_test_SOURCES = \ dns.c dns.h \ @@ -109,7 +103,7 @@ dns_test_SOURCES = \ rr.c rr.h \ hashmap.c hashmap.h dns_test_CFLAGS = $(AM_CFLAGS) -dns_test_LDADD = $(AM_LDADD) $(COMMON_LDADD) +dns_test_LDADD = $(AM_LDADD) ../avahi-common/libavahi-common.la timeeventq_test_SOURCES = \ timeeventq-test.c \ @@ -117,14 +111,14 @@ timeeventq_test_SOURCES = \ prioq.h prioq.c \ log.c log.h timeeventq_test_CFLAGS = $(AM_CFLAGS) -timeeventq_test_LDADD = $(AM_LDADD) $(COMMON_LDADD) +timeeventq_test_LDADD = $(AM_LDADD) ../avahi-common/libavahi-common.la hashmap_test_SOURCES = \ hashmap-test.c \ hashmap.h hashmap.c \ util.h util.c hashmap_test_CFLAGS = $(AM_CFLAGS) -hashmap_test_LDADD = $(AM_LDADD) $(COMMON_LDADD) +hashmap_test_LDADD = $(AM_LDADD) ../avahi-common/libavahi-common.la valgrind: avahi-test libtool --mode=execute valgrind ./avahi-test |