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
---
 avahi-glib/Makefile.am | 21 +++++++--------------
 1 file changed, 7 insertions(+), 14 deletions(-)

(limited to 'avahi-glib')

diff --git a/avahi-glib/Makefile.am b/avahi-glib/Makefile.am
index dd5a14f..7cf0525 100644
--- a/avahi-glib/Makefile.am
+++ b/avahi-glib/Makefile.am
@@ -19,18 +19,13 @@
 
 AM_CFLAGS=-I$(top_srcdir)
 
-# GLIB 2.0
-AM_CFLAGS+=$(GLIB20_CFLAGS)
-AM_LDADD=$(GLIB20_LIBS)
-
-# Import stuff from avahi-common
-COMMON_LDADD=../avahi-common/libavahi-common.la
-
 # This cool debug trap works on i386/gcc only
 AM_CFLAGS+='-DDEBUG_TRAP=__asm__("int $$3")'
 
 avahiincludedir=$(includedir)/avahi-glib
 
+if HAVE_GLIB
+
 avahiinclude_HEADERS = \
 	glib-watch.h
 	glib-malloc.h
@@ -44,16 +39,14 @@ noinst_PROGRAMS = \
 libavahi_glib_la_SOURCES = \
 	glib-watch.c glib-watch.h \
 	glib-malloc.h glib-malloc.c
-libavahi_glib_la_CFLAGS = $(AM_CFLAGS)
-libavahi_glib_la_LIBADD = $(AM_LDADD) $(COMMON_LDADD)
+libavahi_glib_la_CFLAGS = $(AM_CFLAGS) $(GLIB20_CFLAGS)
+libavahi_glib_la_LIBADD = $(AM_LDADD) ../avahi-common/libavahi-common.la $(GLIB20_LIBS)
 
 glib_watch_test_SOURCES = \
 	glib-watch.c glib-watch.h \
 	glib-watch-test.c
-glib_watch_test_CFLAGS = $(AM_CFLAGS)
-glib_watch_test_LDADD = $(AM_LDADD) $(COMMON_LDADD)
-
-
-
+glib_watch_test_CFLAGS = $(AM_CFLAGS) $(GLIB20_CFLAGS)
+glib_watch_test_LDADD = $(AM_LDADD) ../avahi-common/libavahi-common.la $(GLIB20_LIBS)
 
+endif
 
-- 
cgit