X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;f=avahi-ui%2FMakefile.am;h=6dbbd24ae41e1bea20ee95691ea79166c2721d1e;hb=9f00e061367adf8889e8faa17553f71f29ef2362;hp=39b9aca3c17bd49e245a97a1a14ff5ccd765b86e;hpb=2937706e9df4081e03ec8fc26494c4c1a116a098;p=catta

diff --git a/avahi-ui/Makefile.am b/avahi-ui/Makefile.am
index 39b9aca..6dbbd24 100644
--- a/avahi-ui/Makefile.am
+++ b/avahi-ui/Makefile.am
@@ -24,12 +24,15 @@ AM_CFLAGS+='-DDEBUG_TRAP=__asm__("int $$3")'
 
 desktopdir = $(datadir)/applications
 desktop_DATA = 
+desktop_DATA_in = $(desktop_DATA_in_in:.in.in=.in)
+desktop_DATA_in_in = bssh.desktop.in.in bvnc.desktop.in.in
 
-EXTRA_DIST = bssh.desktop.in bvnc.desktop.in
-
+EXTRA_DIST = $(desktop_DATA_in_in)
 
 if HAVE_GTK
+AM_CFLAGS += -DGNOMELOCALEDIR=\"$(datadir)/locale\"
 if HAVE_DBUS
+if HAVE_GLIB
 
 avahiincludedir=$(includedir)/avahi-ui
 
@@ -43,7 +46,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
@@ -58,6 +61,7 @@ endif
 
 bin_PROGRAMS = bssh
 desktop_DATA += bssh.desktop bvnc.desktop
+@INTLTOOL_DESKTOP_RULE@
 
 bssh_SOURCES = bssh.c
 bssh_CFLAGS = $(AM_CFLAGS) $(GTK20_CFLAGS)
@@ -65,16 +69,20 @@ 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
+bssh.desktop.in: bssh.desktop.in.in
 	sed -e 's,@bindir\@,$(bindir),g' $< > $@
 
-bvnc.desktop: bvnc.desktop.in
+bvnc.desktop.in: bvnc.desktop.in.in
 	sed -e 's,@bindir\@,$(bindir),g' $< > $@
 
+endif # HAVE_GLIB
 endif
 endif
 
-CLEANFILES = $(desktop_DATA)
+@INTLTOOL_DESKTOP_RULE@
+
+CLEANFILES = $(desktop_DATA) $(desktop_DATA_in)