From f1167112d926b189fe189599576e8588923f036c Mon Sep 17 00:00:00 2001
From: Lennart Poettering <lennart@poettering.net>
Date: Mon, 15 Aug 2005 21:31:30 +0000
Subject: * 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
---
 tests/Makefile.am | 35 ++++++++++++++++++++++-------------
 1 file changed, 22 insertions(+), 13 deletions(-)

(limited to 'tests/Makefile.am')

diff --git a/tests/Makefile.am b/tests/Makefile.am
index 5b146c0..1fee9d8 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -20,24 +20,33 @@
 AM_CFLAGS= \
 	-I$(top_srcdir)
 
-# GLIB 2.0
-AM_CFLAGS+=$(GLIB20_CFLAGS)
-AM_LDADD=$(GLIB20_LIBS)
+if HAVE_GLIB
+if HAVE_DBUS
 
-# DBUS
-AM_CFLAGS+=$(DBUS_CFLAGS)
-AM_LDADD+=$(DBUS_LIBS)
+noinst_PROGRAMS = c-plus-plus-test
 
-noinst_PROGRAMS = \
-	c-plus-plus-test
+c_plus_plus_test_SOURCES = c-plus-plus-test.cc
 
-c_plus_plus_test_SOURCES = \
-	c-plus-plus-test.cc
+c_plus_plus_test_CXXFLAGS = \
+	$(AM_CFLAGS) \
+	$(GLIB20_CFLAGS) \
+	$(DBUS_CFLAGS)
 
-c_plus_plus_test_CXXFLAGS = $(AM_CFLAGS)
-c_plus_plus_test_LDADD = $(AM_LDADD) ../avahi-common/libavahi-common.la ../avahi-core/libavahi-core.la
+c_plus_plus_test_LDADD = \
+	$(AM_LDADD) \
+	../avahi-common/libavahi-common.la \
+	../avahi-core/libavahi-core.la \
+	../avahi-client/libavahi-client.la \
+	../avahi-glib/libavahi-glib.la  \
+	$(GLIB20_LIBS) \
+	$(DBUS_LIBS)
+
+
+endif
+endif
 
 EXTRA_DIST=c-plus-plus-test-gen.py
 
 gen:
-	python ./c-plus-plus-test-gen.py > c-plus-plus-test.cc
+	python ./c-plus-plus-test-gen.py avahi-common avahi-core avahi-client avahi-glib > c-plus-plus-test.cc
+
-- 
cgit