X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;f=avahi-glib%2FMakefile.am;h=69bd51ea60ac6dbc7ae3f66f155021940e5fd3a2;hb=e7bcb6b9a448332e34855128b4d496b852dfd2af;hp=6cfc46ebd7089d5c2c751636f2934cac0f41aa4d;hpb=5d047523c87ba11aad8c384f7ffde25b4dd746ed;p=catta diff --git a/avahi-glib/Makefile.am b/avahi-glib/Makefile.am index 6cfc46e..69bd51e 100644 --- a/avahi-glib/Makefile.am +++ b/avahi-glib/Makefile.am @@ -19,39 +19,38 @@ 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 +if ENABLE_TESTS + noinst_PROGRAMS = \ glib-watch-test +endif + 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 $(LIBAVAHI_GLIB_VERSION_INFO) 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