X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;ds=sidebyside;f=avahi-ui%2FMakefile.am;h=0fd232faa311c2de05484c89b93ac654bae9392e;hb=aec83994fea80aec0965bc9ecc95fe0139be3160;hp=442f7d1e3528311c7dc2f16bd54e20c264cd47cb;hpb=bbe8d301e832744389f2c32cf440dd60f918bad7;p=catta

diff --git a/avahi-ui/Makefile.am b/avahi-ui/Makefile.am
index 442f7d1..0fd232f 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")'
@@ -25,6 +25,9 @@ AM_CFLAGS+='-DDEBUG_TRAP=__asm__("int $$3")'
 desktopdir = $(datadir)/applications
 desktop_DATA = 
 
+EXTRA_DIST = bssh.desktop.in bvnc.desktop.in
+
+
 if HAVE_GTK
 if HAVE_DBUS
 
@@ -44,34 +47,35 @@ libavahi_ui_la_LDFLAGS = $(AM_LDFLAGS) -export-dynamic -version-info $(LIBAVAHI_
 
 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
 
-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: bssh.desktop.in
 	sed -e 's,@bindir\@,$(bindir),g' $< > $@
-	chmod +x $@
 
-zvnc.desktop: zvnc.desktop.in
+bvnc.desktop: bvnc.desktop.in
 	sed -e 's,@bindir\@,$(bindir),g' $< > $@
-	chmod +x $@
 
 endif
 endif
+
+CLEANFILES = $(desktop_DATA)