Merge branch 'master' of /srv/git/r/doldaconnect

[doldaconnect.git] / clients / gnome-trans-applet / Makefile.am

diff --git a/clients/gnome-trans-applet/Makefile.am b/clients/gnome-trans-applet/Makefile.am
index c73f993..3b24d8d 100644 (file)
--- a/clients/gnome-trans-applet/Makefile.am
+++ b/clients/gnome-trans-applet/Makefile.am
@@ -1,4 +1,7 @@
+if CLI_GNOMEAPPLET
 libexec_PROGRAMS=dolcon-trans-applet
+server_DATA=Dolcon_Transferapplet_Factory.server
+endif
 
 dolcon_trans_applet_SOURCES=   dolcon-trans-applet.c \
                                conduit-pipe.c \
@@ -7,16 +10,16 @@ dolcon_trans_applet_SOURCES= dolcon-trans-applet.c \
                                conduit.h
 
 localedir=$(datadir)/locale
-dolcon_trans_applet_LDFLAGS=$(shell pkg-config --libs libpanelapplet-2.0)
+dolcon_trans_applet_LDFLAGS=@PANELAPPLET_LIBS@
 dolcon_trans_applet_LDADD=$(top_srcdir)/lib/libdcui.la
-dolcon_trans_applet_CPPFLAGS=$(shell pkg-config --cflags libpanelapplet-2.0) -DLOCALEDIR=\"$(localedir)\"
+dolcon_trans_applet_CPPFLAGS=@PANELAPPLET_CFLAGS@ -DLOCALEDIR=\"$(localedir)\"
 
 BUILT_SOURCES=Dolcon_Transferapplet_Factory.server
 
 serverdir=$(libdir)/bonobo/servers
-server_DATA=Dolcon_Transferapplet_Factory.server
 
 EXTRA_DIST=Dolcon_Transferapplet_Factory.server.in
 
-%.server: %.server.in
+SUFFIXES=.server .server.in
+.server.in.server:
        sed -e "s|\@LIBEXECDIR\@|$(libexecdir)|" $< > $@