X-Git-Url: http://git.dolda2000.com/gitweb/?a=blobdiff_plain;f=clients%2Fgtk2%2FMakefile.am;h=13561ad804365e61b7e1765278f1776725e06910;hb=9e5a735ca0027b9fcc9b6ed0cac935ecd2247acf;hp=affec2a6a3fd513aa36afd95395b4d0a74e6674e;hpb=fc10781819cf46bef6842c49b985d5a015720bb3;p=doldaconnect.git

diff --git a/clients/gtk2/Makefile.am b/clients/gtk2/Makefile.am
index affec2a..13561ad 100644
--- a/clients/gtk2/Makefile.am
+++ b/clients/gtk2/Makefile.am
@@ -1,21 +1,37 @@
+if CLI_GTK2
 bin_PROGRAMS=dolcon
+if !GUISHELL
+app_DATA=dolcon.desktop
+endif
+endif
 
-dolcon_SOURCES=	main.c \
+dolcon_SOURCES=	dolcon.c \
+		dolcon.h \
+		hublist.c \
+		hublist.h \
+		hublist-xml.c \
+		hublist-old.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
+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)
-dolcon_LDADD=$(top_srcdir)/lib/libdcui.la
-dolcon_CPPFLAGS=$(shell pkg-config --cflags gtk+-2.0) -DLOCALEDIR=\"$(localedir)\"
+dolcon_LDFLAGS=	@GTK2_LIBS@ @LIBXML_LIBS@ -lbz2
+dolcon_LDADD=$(top_srcdir)/lib/libdcui.la $(top_srcdir)/common/libhttp.a
+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