Dolda2000 GitWeb
/
doldaconnect.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Begin documenting the data model.
[doldaconnect.git]
/
config
/
Makefile.am
diff --git
a/config/Makefile.am
b/config/Makefile.am
index
5a2e5b6
..
705bf0a
100644
(file)
--- a/
config/Makefile.am
+++ b/
config/Makefile.am
@@
-1,5
+1,8
@@
-bin_PROGRAMS=locktouch tthsum dolconf
-if baseconv
+bin_PROGRAMS=locktouch tthsum
+if DOLCONF
+bin_PROGRAMS+=dolconf
+endif
+if BASECONV
bin_PROGRAMS+=baseconv
else
noinst_PROGRAMS=baseconv
bin_PROGRAMS+=baseconv
else
noinst_PROGRAMS=baseconv
@@
-19,14
+22,12
@@
baseconv_LDADD=$(top_srcdir)/common/libcommon.a
dolconf.c: dolconf-assistant.desc dolconf-wnd.desc
localedir=$(datadir)/locale
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)\"
-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
$(top_srcdir)/common/makegdesc $< >$@
EXTRA_DIST=doldacond.conf dc-filter dc-filtercmd dolconf-assistant.desc dolconf-wnd.desc