get rid of a lot of old svn cruft

[catta] / avahi-ui / Makefile.am

diff --git a/avahi-ui/Makefile.am b/avahi-ui/Makefile.am
index 39b9aca3c17bd49e245a97a1a14ff5ccd765b86e..9d5a07ab271d4ee8379d787db816280dd2ef9fc5 100644 (file)
--- a/avahi-ui/Makefile.am
+++ b/avahi-ui/Makefile.am
@@ -1,7 +1,5 @@
-# $Id$
-#
 # This file is part of avahi.
-# 
+#
 # avahi is free software; you can redistribute it and/or modify it
 # under the terms of the GNU Lesser General Public License as
 # published by the Free Software Foundation; either version 2 of the
@@ -23,13 +21,16 @@ AM_CFLAGS=-I$(top_srcdir) -DG_DISABLE_DEPRECATED=1 -DGDK_DISABLE_DEPRECATED=1 -D
 AM_CFLAGS+='-DDEBUG_TRAP=__asm__("int $$3")'
 
 desktopdir = $(datadir)/applications
-desktop_DATA = 
-
-EXTRA_DIST = bssh.desktop.in bvnc.desktop.in
+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 = $(desktop_DATA_in_in)
 
 if HAVE_GTK
+AM_CFLAGS += -DGNOMELOCALEDIR=\"$(datadir)/locale\"
 if HAVE_DBUS
+if HAVE_GLIB
 
 avahiincludedir=$(includedir)/avahi-ui
 
@@ -37,13 +38,13 @@ avahiinclude_HEADERS = \
        avahi-ui.h
 
 lib_LTLIBRARIES = \
-       libavahi-ui.la 
+       libavahi-ui.la
 
 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 +59,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 +67,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
-       sed -e 's,@bindir\@,$(bindir),g' $< > $@
+bssh.desktop.in: bssh.desktop.in.in
+       $(AM_V_GEN)sed -e 's,@bindir\@,$(bindir),g' $< > $@
 
-bvnc.desktop: bvnc.desktop.in
-       sed -e 's,@bindir\@,$(bindir),g' $< > $@
+bvnc.desktop.in: bvnc.desktop.in.in
+       $(AM_V_GEN)sed -e 's,@bindir\@,$(bindir),g' $< > $@
 
+endif # HAVE_GLIB
 endif
 endif
 
-CLEANFILES = $(desktop_DATA)
+@INTLTOOL_DESKTOP_RULE@
+
+CLEANFILES = $(desktop_DATA) $(desktop_DATA_in)