diff options
| author | Lennart Poettering <lennart@poettering.net> | 2010-06-25 05:29:23 +0200 |
|---|---|---|
| committer | Lennart Poettering <lennart@poettering.net> | 2010-06-25 05:29:23 +0200 |
| commit | 767bac373b93988410269f170a1dcbd45bc97777 (patch) | |
| tree | 1cca697c1fea46acff7c8595a759a475c6491155 /avahi-discover-standalone | |
| parent | 5e401ee6a8f1c0d0a84e9e239c47f50607e4c093 (diff) | |
gtk: build for both gtk2 and gtk3
Diffstat (limited to 'avahi-discover-standalone')
| -rw-r--r-- | avahi-discover-standalone/Makefile.am | 18 |
1 files changed, 14 insertions, 4 deletions
diff --git a/avahi-discover-standalone/Makefile.am b/avahi-discover-standalone/Makefile.am index 1163575..3995c0a 100644 --- a/avahi-discover-standalone/Makefile.am +++ b/avahi-discover-standalone/Makefile.am @@ -23,8 +23,8 @@ interfaces = \ # This cool debug trap works on i386/gcc only AM_CFLAGS+='-DDEBUG_TRAP=__asm__("int $$3")' -if HAVE_GTK -if HAVE_GLIB +if HAVE_GTK2OR3 +if HAVE_GLIB bin_PROGRAMS = \ avahi-discover-standalone @@ -33,15 +33,25 @@ avahi_discover_standalone_SOURCES = \ avahi_discover_standalone_CFLAGS = \ $(AM_CFLAGS) \ - $(GLIB20_CFLAGS) $(GTK20_CFLAGS) \ -DAVAHI_INTERFACES_DIR=\"$(interfacesdir)\" avahi_discover_standalone_LDADD = \ $(AM_LDADD) \ ../avahi-common/libavahi-common.la \ ../avahi-glib/libavahi-glib.la \ - ../avahi-core/libavahi-core.la \ + ../avahi-core/libavahi-core.la + +if HAVE_GTK3 +avahi_discover_standalone_CFLAGS += \ + $(GLIB30_CFLAGS) $(GTK30_CFLAGS) +avahi_discover_standalone_LDADD += \ + $(GLIB30_LIBS) $(GTK30_LIBS) +else +avahi_discover_standalone_CFLAGS += \ + $(GLIB20_CFLAGS) $(GTK20_CFLAGS) +avahi_discover_standalone_LDADD += \ $(GLIB20_LIBS) $(GTK20_LIBS) +endif interfaces_DATA = $(interfaces) |