Merge branch 'dolcon-split'

[doldaconnect.git] / config / util / Makefile.am

diff --git a/config/util/Makefile.am b/config/util/Makefile.am
index d2830e5..6f84a4e 100644 (file)
--- a/config/util/Makefile.am
+++ b/config/util/Makefile.am
@@ -17,12 +17,14 @@ baseconv_LDADD=$(top_srcdir)/common/libcommon.a
 
 dolconf.c: dolconf-assistant.desc dolconf-wnd.desc
 localedir=$(datadir)/locale
-dolconf_LDFLAGS=       @GTK2_LDADD@
+dolconf_LDFLAGS=       @GTK2_LIBS@
 dolconf_CPPFLAGS=      @GTK2_CFLAGS@ \
                        -DLOCALEDIR=\"$(localedir)\"
 dolconf_LDADD=         $(top_srcdir)/common/libcommon.a $(top_srcdir)/lib/libdcui.la
 
 .desc.gtk: $(top_srcdir)/common/makegdesc
-       $(top_srcdir)/common/makegdesc $< >$@
+       target="$@"; \
+       basename="$${target%.gtk}"; \
+       $(top_srcdir)/common/makegdesc -h "$${basename}.gtkh" $< >$@
 
 EXTRA_DIST=dolconf-assistant.desc dolconf-wnd.desc