Don't link everything against lib{z,bz2,pam,gdbm}.

[doldaconnect.git] / clients / gtk2 / Makefile.am

diff --git a/clients/gtk2/Makefile.am b/clients/gtk2/Makefile.am
index 32a9349..13561ad 100644 (file)
--- a/clients/gtk2/Makefile.am
+++ b/clients/gtk2/Makefile.am
@@ -1,27 +1,36 @@
 if CLI_GTK2
 bin_PROGRAMS=dolcon
+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=        @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