X-Git-Url: http://dolda2000.com/gitweb/?a=blobdiff_plain;f=clients%2Fgtk2%2FMakefile.am;h=67e764624d1590c4e48f8b51a0be67f240f559fa;hb=4dda7bfaad18c2d4bf23d7b85641c34a632c3ae6;hp=6afbb6f9887414949c977abb1e1a62311f5ee4c5;hpb=d3372da97568d5e1f35fa19787c8ec8af93a0435;p=doldaconnect.git

diff --git a/clients/gtk2/Makefile.am b/clients/gtk2/Makefile.am
index 6afbb6f..67e7646 100644
--- a/clients/gtk2/Makefile.am
+++ b/clients/gtk2/Makefile.am
@@ -1,21 +1,30 @@
+if CLI_GTK2
 bin_PROGRAMS=dolcon
+app_DATA=dolcon.desktop
+endif
 
-dolcon_SOURCES=	main.c \
+dolcon_SOURCES=	dolcon.c \
 		progressbar.c \
 		progressbar.h
 
-EXTRA_DIST=mainwnd.desc inpdialog.desc pref.desc makegdesc
+EXTRA_DIST=mainwnd.desc inpdialog.desc pref.desc reslist.desc dolcon.desktop
 
-BUILT_SOURCES=mainwnd.gtk inpdialog.gtk pref.gtk
+BUILT_SOURCES=	mainwnd.gtk inpdialog.gtk pref.gtk reslist.gtk
 
-main.c: mainwnd.gtk inpdialog.gtk
+main.c: mainwnd.gtk inpdialog.gtk pref.gtk reslist.gtk
 
 localedir=$(datadir)/locale
-dolcon_LDFLAGS=$(shell pkg-config --libs gtk+-2.0)
+dolcon_LDFLAGS=	@GTK2_LDADD@ @LIBXML_LDADD@
 dolcon_LDADD=$(top_srcdir)/lib/libdcui.la
-dolcon_CPPFLAGS=$(shell pkg-config --cflags gtk+-2.0) -DLOCALEDIR=\"$(localedir)\"
+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
+	target="$@"; \
+	basename="$${target%.gtk}"; \
+	cpp $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $< \
+	 | $(top_srcdir)/common/makegdesc -h "$${basename}.gtkh" >$@
 
 mainwnd.desc: ../../config.h
+
+appdir=$(datadir)/applications