Remove usage of gmake's $(shell...) from dolcon{,f}.

[doldaconnect.git] / config / Makefile.am

diff --git a/config/Makefile.am b/config/Makefile.am
index 17951d9..705bf0a 100644 (file)
--- a/config/Makefile.am
+++ b/config/Makefile.am
@@ -1,5 +1,12 @@
-bin_PROGRAMS=locktouch tthsum dolconf
+bin_PROGRAMS=locktouch tthsum
+if DOLCONF
+bin_PROGRAMS+=dolconf
+endif
+if BASECONV
+bin_PROGRAMS+=baseconv
+else
 noinst_PROGRAMS=baseconv
+endif
 libexec_PROGRAMS=speedrec
 
 speedrec_SOURCES=speedrec.c
@@ -15,14 +22,12 @@ baseconv_LDADD=$(top_srcdir)/common/libcommon.a
 
 dolconf.c: dolconf-assistant.desc dolconf-wnd.desc
 localedir=$(datadir)/locale
-dolconf_LDFLAGS=       $(shell pkg-config --libs gtk+-2.0) \
-                       $(shell pkg-config --libs libxml-2.0)
-dolconf_CPPFLAGS=      $(shell pkg-config --cflags gtk+-2.0) \
-                       $(shell pkg-config --cflags libxml-2.0) \
+dolconf_LDFLAGS=       @GTK2_LDADD@
+dolconf_CPPFLAGS=      @GTK2_CFLAGS@ \
                        -DLOCALEDIR=\"$(localedir)\"
-dolconf_LDADD=         $(top_srcdir)/common/libcommon.a
+dolconf_LDADD=         $(top_srcdir)/common/libcommon.a $(top_srcdir)/lib/libdcui.la
 
-%.gtk: %.desc $(top_srcdir)/common/makegdesc
+.desc.gtk: $(top_srcdir)/common/makegdesc
        $(top_srcdir)/common/makegdesc $< >$@
 
 EXTRA_DIST=doldacond.conf dc-filter dc-filtercmd dolconf-assistant.desc dolconf-wnd.desc