X-Git-Url: http://git.dolda2000.com/gitweb/?a=blobdiff_plain;f=config%2FMakefile.am;h=705bf0ac67d1c707d98d4b35121e03aaf0607493;hb=2466bbc82e1254fe239658273813257d847dd8db;hp=85baae720ab2d828851c3f36f87bced2fbb85e95;hpb=7edbb35a894adba00ffc5bcc057a6d16efb1e2f9;p=doldaconnect.git

diff --git a/config/Makefile.am b/config/Makefile.am
index 85baae7..705bf0a 100644
--- a/config/Makefile.am
+++ b/config/Makefile.am
@@ -1,28 +1,36 @@
-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
 locktouch_SOURCES=locktouch.c
 tthsum_SOURCES=tthsum.c
 dolconf_SOURCES=dolconf.c
-BUILT_SOURCES=dolconf-assistant.gtk
+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.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
+EXTRA_DIST=doldacond.conf dc-filter dc-filtercmd dolconf-assistant.desc dolconf-wnd.desc
 
 install-data-local:
 	$(mkinstalldirs) $(DESTDIR)$(sysconfdir); \