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

diff --git a/config/Makefile.am b/config/Makefile.am
index e6586ca..db77000 100644
--- a/config/Makefile.am
+++ b/config/Makefile.am
@@ -1,14 +1,24 @@
-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
+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
@@ -17,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 $< >$@