Merge branches 'master' and 'master' of ssh://rootserver/home/lennart/git/public...

[catta] / avahi-ui / Makefile.am

diff --git a/avahi-ui/Makefile.am b/avahi-ui/Makefile.am
index 39b9aca3c17bd49e245a97a1a14ff5ccd765b86e..2d687ed712491238471a5b1d601b34e2864476e4 100644 (file)
--- a/avahi-ui/Makefile.am
+++ b/avahi-ui/Makefile.am
@@ -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,7 +44,7 @@ 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
@@ -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