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 2238232..705bf0a 100644 (file)
--- a/config/Makefile.am
+++ b/config/Makefile.am
@@ -1,12 +1,36 @@
 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
-
 locktouch_SOURCES=locktouch.c
 tthsum_SOURCES=tthsum.c
+dolconf_SOURCES=dolconf.c
+baseconv_SOURCES=baseconv.c
+BUILT_SOURCES=dolconf-assistant.gtk dolconf-wnd.gtk
+
+AM_CPPFLAGS=-I$(top_srcdir)/include
+tthsum_LDADD=$(top_srcdir)/common/libcommon.a
+baseconv_LDADD=$(top_srcdir)/common/libcommon.a
+
+dolconf.c: dolconf-assistant.desc dolconf-wnd.desc
+localedir=$(datadir)/locale
+dolconf_LDFLAGS=       @GTK2_LDADD@
+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 $< >$@
 
-EXTRA_DIST=doldacond.conf dc-filter dc-filtercmd
+EXTRA_DIST=doldacond.conf dc-filter dc-filtercmd dolconf-assistant.desc dolconf-wnd.desc
 
 install-data-local:
        $(mkinstalldirs) $(DESTDIR)$(sysconfdir); \