X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;f=avahi-ui%2FMakefile.am;h=2d687ed712491238471a5b1d601b34e2864476e4;hb=23ca50a5a56b6ea98a73480cff50ebb73ecba7ca;hp=c5ef64d22493bcb671fb23fbc5254cc276276627;hpb=300f7ba9449afc23c2b0e23f7b4dba995452b44e;p=catta

diff --git a/avahi-ui/Makefile.am b/avahi-ui/Makefile.am
index c5ef64d..2d687ed 100644
--- a/avahi-ui/Makefile.am
+++ b/avahi-ui/Makefile.am
@@ -17,7 +17,7 @@
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
 # USA.
 
-AM_CFLAGS=-I$(top_srcdir)
+AM_CFLAGS=-I$(top_srcdir) -DG_DISABLE_DEPRECATED=1 -DGDK_DISABLE_DEPRECATED=1 -DGTK_DISABLE_DEPRECATED=1
 
 # This cool debug trap works on i386/gcc only
 AM_CFLAGS+='-DDEBUG_TRAP=__asm__("int $$3")'
@@ -30,6 +30,7 @@ EXTRA_DIST = bssh.desktop.in bvnc.desktop.in
 
 if HAVE_GTK
 if HAVE_DBUS
+if HAVE_GLIB
 
 avahiincludedir=$(includedir)/avahi-ui
 
@@ -43,17 +44,17 @@ libavahi_ui_la_SOURCES = \
 	avahi-ui.h avahi-ui.c
 libavahi_ui_la_CFLAGS = $(AM_CFLAGS) $(GTK20_CFLAGS)
 libavahi_ui_la_LIBADD = $(AM_LDADD) ../avahi-common/libavahi-common.la ../avahi-client/libavahi-client.la ../avahi-glib/libavahi-glib.la $(GTK20_LIBS)
-libavahi_ui_la_LDFLAGS = $(AM_LDFLAGS) -export-dynamic -version-info $(LIBAVAHI_UI_VERSION_INFO)
+libavahi_ui_la_LDFLAGS = $(AM_LDFLAGS)  -version-info $(LIBAVAHI_UI_VERSION_INFO)
 
 if HAVE_GDBM
 libavahi_ui_la_SOURCES += ../avahi-utils/stdb.h ../avahi-utils/stdb.c
-libavahi_ui_la_CFLAGS += -DDATABASE_FILE=\"$(pkgdatadir)/service-types.db\"
+libavahi_ui_la_CFLAGS += -DDATABASE_FILE=\"$(pkglibdir)/service-types.db\"
 libavahi_ui_la_LIBADD += -lgdbm
 endif
 
 if HAVE_DBM
 libavahi_ui_la_SOURCES += ../avahi-utils/stdb.h ../avahi-utils/stdb.c
-libavahi_ui_la_CFLAGS += -DDATABASE_FILE=\"$(pkgdatadir)/service-types.db\"
+libavahi_ui_la_CFLAGS += -DDATABASE_FILE=\"$(pkglibdir)/service-types.db\"
 endif
 
 bin_PROGRAMS = bssh
@@ -65,8 +66,9 @@ bssh_LDADD = $(AM_LDADD) $(GTK20_LIBS) ../avahi-client/libavahi-client.la ../ava
 
 install-exec-local:
 	cd $(DESTDIR)/$(bindir) && \
-		rm -f bvnc && \
-		$(LN_S) bssh bvnc
+		rm -f bvnc bshell && \
+		$(LN_S) bssh bvnc && \
+		$(LN_S) bssh bshell
 
 bssh.desktop: bssh.desktop.in
 	sed -e 's,@bindir\@,$(bindir),g' $< > $@
@@ -74,6 +76,7 @@ bssh.desktop: bssh.desktop.in
 bvnc.desktop: bvnc.desktop.in
 	sed -e 's,@bindir\@,$(bindir),g' $< > $@
 
+endif # HAVE_GLIB
 endif
 endif