X-Git-Url: http://git.dolda2000.com/gitweb/?a=blobdiff_plain;f=clients%2Fgtk2%2FMakefile.am;h=813c8fe8c4a700bded5180fe6e930a2412865cab;hb=dbdb91fa4abf642a9699b1381abf8bcbb05b202c;hp=32a93494140889bd676c243d98da0921884f8639;hpb=9ac4fb2aa0a4f7a9a3c87aceb742a356523fc805;p=doldaconnect.git

diff --git a/clients/gtk2/Makefile.am b/clients/gtk2/Makefile.am
index 32a9349..813c8fe 100644
--- a/clients/gtk2/Makefile.am
+++ b/clients/gtk2/Makefile.am
@@ -1,28 +1,30 @@
 if CLI_GTK2
 bin_PROGRAMS=dolcon
-app_DATA=dolcon.desktop
 endif
 
 dolcon_SOURCES=	dolcon.c \
-		progressbar.c \
-		progressbar.h
+		dolcon.h \
+		hublist.c \
+		hublist.h \
+		hublist-xml.c \
+		hublist-old.c
 
-EXTRA_DIST=mainwnd.desc inpdialog.desc pref.desc reslist.desc dolcon.desktop
+EXTRA_DIST=mainwnd.desc inpdialog.desc pref.desc reslist.desc
 
-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=	@GTK2_LDADD@ @LIBXML_LDADD@
-dolcon_LDADD=$(top_srcdir)/lib/libdcui.la
+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)\"
 
 .desc.gtk: $(top_srcdir)/common/makegdesc
-	cpp $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
-	$(CPPFLAGS) $< | $(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