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

diff --git a/avahi-ui/Makefile.am b/avahi-ui/Makefile.am
index 442f7d1..6dbbd24 100644
--- a/avahi-ui/Makefile.am
+++ b/avahi-ui/Makefile.am
@@ -17,16 +17,22 @@
 # 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")'
 
 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 = $(desktop_DATA_in_in)
 
 if HAVE_GTK
+AM_CFLAGS += -DGNOMELOCALEDIR=\"$(datadir)/locale\"
 if HAVE_DBUS
+if HAVE_GLIB
 
 avahiincludedir=$(includedir)/avahi-ui
 
@@ -40,38 +46,43 @@ 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 = zssh
-desktop_DATA += zssh.desktop zvnc.desktop
+bin_PROGRAMS = bssh
+desktop_DATA += bssh.desktop bvnc.desktop
+@INTLTOOL_DESKTOP_RULE@
 
-zssh_SOURCES = zssh.c
-zssh_CFLAGS = $(AM_CFLAGS) $(GTK20_CFLAGS)
-zssh_LDADD = $(AM_LDADD) $(GTK20_LIBS) ../avahi-client/libavahi-client.la ../avahi-common/libavahi-common.la libavahi-ui.la
+bssh_SOURCES = bssh.c
+bssh_CFLAGS = $(AM_CFLAGS) $(GTK20_CFLAGS)
+bssh_LDADD = $(AM_LDADD) $(GTK20_LIBS) ../avahi-client/libavahi-client.la ../avahi-common/libavahi-common.la libavahi-ui.la
 
 install-exec-local:
 	cd $(DESTDIR)/$(bindir) && \
-		rm -f zvnc && \
-		$(LN_S) zssh zvnc
+		rm -f bvnc bshell && \
+		$(LN_S) bssh bvnc && \
+		$(LN_S) bssh bshell
 
-zssh.desktop: zssh.desktop.in
+bssh.desktop.in: bssh.desktop.in.in
 	sed -e 's,@bindir\@,$(bindir),g' $< > $@
-	chmod +x $@
 
-zvnc.desktop: zvnc.desktop.in
+bvnc.desktop.in: bvnc.desktop.in.in
 	sed -e 's,@bindir\@,$(bindir),g' $< > $@
-	chmod +x $@
 
+endif # HAVE_GLIB
 endif
 endif
+
+@INTLTOOL_DESKTOP_RULE@
+
+CLEANFILES = $(desktop_DATA) $(desktop_DATA_in)