X-Git-Url: http://git.dolda2000.com/gitweb/?a=blobdiff_plain;f=clients%2Fgtk2%2FMakefile.am;h=7cbf39a12188631291d542dc064aeab4b76bd5a0;hb=ed9135a09f5afb91efbd26b77dea23f1b63a9788;hp=57c8d1eecf0250b87fa991557730858543b8498e;hpb=753cbd0434441e733b8f573846d2e93268dac598;p=doldaconnect.git

diff --git a/clients/gtk2/Makefile.am b/clients/gtk2/Makefile.am
index 57c8d1e..7cbf39a 100644
--- a/clients/gtk2/Makefile.am
+++ b/clients/gtk2/Makefile.am
@@ -1,27 +1,37 @@
+if CLI_GTK2
 bin_PROGRAMS=dolcon
-
-dolcon_SOURCES=	main.c \
+if !GUISHELL
+app_DATA=dolcon.desktop
+endif
+endif
+
+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 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) \
-		$(shell pkg-config --libs libxml-2.0)
-dolcon_LDADD=$(top_srcdir)/lib/libdcui.la
-dolcon_CPPFLAGS=$(shell pkg-config --cflags gtk+-2.0) \
-		$(shell pkg-config --cflags libxml-2.0) \
+dolcon_LDFLAGS=	@GTK2_LIBS@ @LIBXML_LIBS@
+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
-app_DATA=dolcon.desktop