X-Git-Url: http://dolda2000.com/gitweb/?a=blobdiff_plain;f=clients%2Fgtk2%2FMakefile.am;h=8c75120780562ccecc6ea8224ce9e20e5cc8ee85;hb=08b74f8c85e9c6c4b1813c8ae8f86a235249641a;hp=6d50e01ac08bffc3f993be860bf636654537d035;hpb=89d3e6ceac68c09d101b1679a05f4169d3cffaa6;p=doldaconnect.git

diff --git a/clients/gtk2/Makefile.am b/clients/gtk2/Makefile.am
index 6d50e01..8c75120 100644
--- a/clients/gtk2/Makefile.am
+++ b/clients/gtk2/Makefile.am
@@ -1,24 +1,27 @@
+if CLI_GTK2
 bin_PROGRAMS=dolcon
+app_DATA=dolcon.desktop
+endif
 
 dolcon_SOURCES=	main.c \
 		progressbar.c \
 		progressbar.h
 
-EXTRA_DIST=mainwnd.desc inpdialog.desc pref.desc reslist.desc makegdesc
+EXTRA_DIST=mainwnd.desc inpdialog.desc pref.desc reslist.desc dolcon.desktop
 
 BUILT_SOURCES=mainwnd.gtk inpdialog.gtk pref.gtk reslist.gtk
 
 main.c: mainwnd.gtk inpdialog.gtk pref.gtk reslist.gtk
 
 localedir=$(datadir)/locale
-dolcon_LDFLAGS=	$(shell pkg-config --libs gtk+-2.0) \
-		$(shell pkg-config --libs libxml-2.0)
+dolcon_LDFLAGS=	@GTK2_LDADD@ @LIBXML_LDADD@
 dolcon_LDADD=$(top_srcdir)/lib/libdcui.la
-dolcon_CPPFLAGS=$(shell pkg-config --cflags gtk+-2.0) \
-		$(shell pkg-config --cflags libxml-2.0) \
+dolcon_CPPFLAGS=@GTK2_CFLAGS@ @LIBXML_CFLAGS@ \
 		-DLOCALEDIR=\"$(localedir)\"
 
-%.gtk: %.desc makegdesc
-	cpp $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $< | ./makegdesc >$@
+.desc.gtk: $(top_srcdir)/common/makegdesc
+	cpp $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $< | $(top_srcdir)/common/makegdesc >$@
 
 mainwnd.desc: ../../config.h
+
+appdir=$(datadir)/applications