X-Git-Url: http://git.dolda2000.com/gitweb/?a=blobdiff_plain;f=config%2FMakefile.am;h=db77000798bc43cb394f5a53dddd16f2f826aa37;hb=87ca1fb5065d3bea8f23eac6ae45f5b1d6e388b2;hp=17951d9beae9b102fec35d3508be15189889916f;hpb=dc32e1a7ee7669b5dcb7b2b007fcd3606b323373;p=doldaconnect.git

diff --git a/config/Makefile.am b/config/Makefile.am
index 17951d9..db77000 100644
--- 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
@@ -20,7 +27,7 @@ dolconf_LDFLAGS=	$(shell pkg-config --libs gtk+-2.0) \
 dolconf_CPPFLAGS=	$(shell pkg-config --cflags gtk+-2.0) \
 			$(shell pkg-config --cflags libxml-2.0) \
 			-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
 	$(top_srcdir)/common/makegdesc $< >$@