X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;f=avahi-glib%2FMakefile.am;h=7cf0525302df32e5debbdac8b64fa3d4c08139a1;hb=f1167112d926b189fe189599576e8588923f036c;hp=6cfc46ebd7089d5c2c751636f2934cac0f41aa4d;hpb=5d047523c87ba11aad8c384f7ffde25b4dd746ed;p=catta

diff --git a/avahi-glib/Makefile.am b/avahi-glib/Makefile.am
index 6cfc46e..7cf0525 100644
--- a/avahi-glib/Makefile.am
+++ b/avahi-glib/Makefile.am
@@ -19,20 +19,16 @@
 
 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
 
 lib_LTLIBRARIES = \
 	libavahi-glib.la 
@@ -41,17 +37,16 @@ noinst_PROGRAMS = \
 	glib-watch-test
 
 libavahi_glib_la_SOURCES = \
-	glib-watch.c glib-watch.h
-libavahi_glib_la_CFLAGS = $(AM_CFLAGS)
-libavahi_glib_la_LIBADD = $(AM_LDADD) $(COMMON_LDADD)
+	glib-watch.c glib-watch.h \
+	glib-malloc.h glib-malloc.c
+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