Added ill_get_APDU and ill_get_Cancel.

[yaz-moved-to-github.git] / util / Makefile.in

diff --git a/util/Makefile.in b/util/Makefile.in
index 8678e95..4152c57 100644 (file)
--- a/util/Makefile.in
+++ b/util/Makefile.in
@@ -67,6 +67,7 @@ DLLTOOL = @DLLTOOL@
 ILLLIB = @ILLLIB@
 ILLMODULE = @ILLMODULE@
 LD = @LD@
+LIBTHREAD = @LIBTHREAD@
 LIBTOOL = @LIBTOOL@
 LN_S = @LN_S@
 MAKEINFO = @MAKEINFO@
@@ -74,11 +75,15 @@ NM = @NM@
 OBJDUMP = @OBJDUMP@
 PACKAGE = @PACKAGE@
 RANLIB = @RANLIB@
+READLINE_LIBS = @READLINE_LIBS@
 SUBDIRS_VAR = @SUBDIRS_VAR@
 VERSION = @VERSION@
+YAZ_SRC_ROOT = @YAZ_SRC_ROOT@
 
 noinst_LTLIBRARIES = libutil.la
 
+#lib_LTLIBRARIES = libyazthread.la
+
 bin_SCRIPTS = yaz-comp
 
 EXTRA_DIST = yaz-comp
@@ -87,6 +92,14 @@ LIBS =
 
 INCLUDES = -I$(srcdir)/../include
 
+libyazthread_la_INCLUDES = -I$(srcdir)/../include
+
+noinst_PROGRAMS = marcdump
+
+marcdump_LDADD = libutil.la 
+
+marcdump_SOURCES = marcdump.c
+
 libutil_la_SOURCES = options.c log.c marcdisp.c oid.c wrbuf.c nmemsdup.c    xmalloc.c readconf.c tpath.c nmem.c matchstr.c atoin.c 
 
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
@@ -102,6 +115,11 @@ libutil_la_LIBADD =
 libutil_la_OBJECTS =  options.lo log.lo marcdisp.lo oid.lo wrbuf.lo \
 nmemsdup.lo xmalloc.lo readconf.lo tpath.lo nmem.lo matchstr.lo \
 atoin.lo
+PROGRAMS =  $(noinst_PROGRAMS)
+
+marcdump_OBJECTS =  marcdump.o
+marcdump_DEPENDENCIES =  libutil.la
+marcdump_LDFLAGS = 
 SCRIPTS =  $(bin_SCRIPTS)
 
 CFLAGS = @CFLAGS@
@@ -116,11 +134,12 @@ DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
 
 TAR = gtar
 GZIP_ENV = --best
-DEP_FILES =  .deps/atoin.P .deps/log.P .deps/marcdisp.P .deps/matchstr.P \
-.deps/nmem.P .deps/nmemsdup.P .deps/oid.P .deps/options.P \
-.deps/readconf.P .deps/tpath.P .deps/wrbuf.P .deps/xmalloc.P
-SOURCES = $(libutil_la_SOURCES)
-OBJECTS = $(libutil_la_OBJECTS)
+DEP_FILES =  .deps/atoin.P .deps/log.P .deps/marcdisp.P .deps/marcdump.P \
+.deps/matchstr.P .deps/nmem.P .deps/nmemsdup.P .deps/oid.P \
+.deps/options.P .deps/readconf.P .deps/tpath.P .deps/wrbuf.P \
+.deps/xmalloc.P
+SOURCES = $(libutil_la_SOURCES) $(marcdump_SOURCES)
+OBJECTS = $(libutil_la_OBJECTS) $(marcdump_OBJECTS)
 
 all: all-redirect
 .SUFFIXES:
@@ -177,6 +196,19 @@ maintainer-clean-libtool:
 libutil.la: $(libutil_la_OBJECTS) $(libutil_la_DEPENDENCIES)
        $(LINK)  $(libutil_la_LDFLAGS) $(libutil_la_OBJECTS) $(libutil_la_LIBADD) $(LIBS)
 
+mostlyclean-noinstPROGRAMS:
+
+clean-noinstPROGRAMS:
+       -test -z "$(noinst_PROGRAMS)" || rm -f $(noinst_PROGRAMS)
+
+distclean-noinstPROGRAMS:
+
+maintainer-clean-noinstPROGRAMS:
+
+marcdump: $(marcdump_OBJECTS) $(marcdump_DEPENDENCIES)
+       @rm -f marcdump
+       $(LINK) $(marcdump_LDFLAGS) $(marcdump_OBJECTS) $(marcdump_LDADD) $(LIBS)
+
 install-binSCRIPTS: $(bin_SCRIPTS)
        @$(NORMAL_INSTALL)
        $(mkinstalldirs) $(DESTDIR)$(bindir)
@@ -296,7 +328,7 @@ install-am: all-am
 install: install-am
 uninstall-am: uninstall-binSCRIPTS
 uninstall: uninstall-am
-all-am: Makefile $(LTLIBRARIES) $(SCRIPTS)
+all-am: Makefile $(LTLIBRARIES) $(PROGRAMS) $(SCRIPTS)
 all-redirect: all-am
 install-strip:
        $(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install
@@ -314,27 +346,30 @@ distclean-generic:
 
 maintainer-clean-generic:
 mostlyclean-am:  mostlyclean-noinstLTLIBRARIES mostlyclean-compile \
-               mostlyclean-libtool mostlyclean-tags mostlyclean-depend \
-               mostlyclean-generic
+               mostlyclean-libtool mostlyclean-noinstPROGRAMS \
+               mostlyclean-tags mostlyclean-depend mostlyclean-generic
 
 mostlyclean: mostlyclean-am
 
 clean-am:  clean-noinstLTLIBRARIES clean-compile clean-libtool \
-               clean-tags clean-depend clean-generic mostlyclean-am
+               clean-noinstPROGRAMS clean-tags clean-depend \
+               clean-generic mostlyclean-am
 
 clean: clean-am
 
 distclean-am:  distclean-noinstLTLIBRARIES distclean-compile \
-               distclean-libtool distclean-tags distclean-depend \
-               distclean-generic clean-am
+               distclean-libtool distclean-noinstPROGRAMS \
+               distclean-tags distclean-depend distclean-generic \
+               clean-am
        -rm -f libtool
 
 distclean: distclean-am
 
 maintainer-clean-am:  maintainer-clean-noinstLTLIBRARIES \
                maintainer-clean-compile maintainer-clean-libtool \
-               maintainer-clean-tags maintainer-clean-depend \
-               maintainer-clean-generic distclean-am
+               maintainer-clean-noinstPROGRAMS maintainer-clean-tags \
+               maintainer-clean-depend maintainer-clean-generic \
+               distclean-am
        @echo "This command is intended for maintainers to use;"
        @echo "it deletes files that may require special tools to rebuild."
 
@@ -344,17 +379,21 @@ maintainer-clean: maintainer-clean-am
 clean-noinstLTLIBRARIES maintainer-clean-noinstLTLIBRARIES \
 mostlyclean-compile distclean-compile clean-compile \
 maintainer-clean-compile mostlyclean-libtool distclean-libtool \
-clean-libtool maintainer-clean-libtool uninstall-binSCRIPTS \
-install-binSCRIPTS tags mostlyclean-tags distclean-tags clean-tags \
-maintainer-clean-tags distdir mostlyclean-depend distclean-depend \
-clean-depend maintainer-clean-depend info-am info dvi-am dvi check \
-check-am installcheck-am installcheck install-exec-am install-exec \
+clean-libtool maintainer-clean-libtool mostlyclean-noinstPROGRAMS \
+distclean-noinstPROGRAMS clean-noinstPROGRAMS \
+maintainer-clean-noinstPROGRAMS uninstall-binSCRIPTS install-binSCRIPTS \
+tags mostlyclean-tags distclean-tags clean-tags maintainer-clean-tags \
+distdir mostlyclean-depend distclean-depend clean-depend \
+maintainer-clean-depend info-am info dvi-am dvi check check-am \
+installcheck-am installcheck install-exec-am install-exec \
 install-data-am install-data install-am install uninstall-am uninstall \
 all-redirect all-am all installdirs mostlyclean-generic \
 distclean-generic clean-generic maintainer-clean-generic clean \
 mostlyclean distclean maintainer-clean
 
 
+#libyazthread_la_SOURCES=nmemthread.c xmalloc.c log.c
+
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT: