add a bad bad joke

[catta] / avahi-glib / Makefile.am

diff --git a/avahi-glib/Makefile.am b/avahi-glib/Makefile.am
index 6cfc46ebd7089d5c2c751636f2934cac0f41aa4d..f5ac4cedad0f8dacc54cea57724b200c56970c1e 100644 (file)
--- 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")'
 
+if HAVE_GLIB
+
 avahiincludedir=$(includedir)/avahi-glib
 
 avahiinclude_HEADERS = \
-       glib-watch.h
+       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)
+libavahi_glib_la_LDFLAGS = $(AM_LDFLAGS) -export-dynamic -version-info 0:1:0
 
 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