projects / yaz-moved-to-github.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
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 986103a..4152c57 100644 (file)
--- a/util/Makefile.in
+++ b/util/Makefile.in
@@ -57,46 +57,76 @@ POST_INSTALL = :
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
+host_alias = @host_alias@
+host_triplet = @host@
+AS = @AS@
 ASNMODULE = @ASNMODULE@
 CC = @CC@
 CPP = @CPP@
+DLLTOOL = @DLLTOOL@
 ILLLIB = @ILLLIB@
 ILLMODULE = @ILLMODULE@
+LD = @LD@
+LIBTHREAD = @LIBTHREAD@
+LIBTOOL = @LIBTOOL@
+LN_S = @LN_S@
 MAKEINFO = @MAKEINFO@
+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_LIBRARIES = libutil.a
+noinst_LTLIBRARIES = libutil.la
+
+#lib_LTLIBRARIES = libyazthread.la
 
 bin_SCRIPTS = yaz-comp
 
 EXTRA_DIST = yaz-comp
 
-INCLUDES = -I../include
+LIBS = 
+
+INCLUDES = -I$(srcdir)/../include
+
+libyazthread_la_INCLUDES = -I$(srcdir)/../include
+
+noinst_PROGRAMS = marcdump
+
+marcdump_LDADD = libutil.la 
 
-libutil_a_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 
+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
 CONFIG_CLEAN_FILES = 
-LIBRARIES =  $(noinst_LIBRARIES)
+LTLIBRARIES =  $(noinst_LTLIBRARIES)
 
 
 DEFS = @DEFS@ -I. -I$(srcdir) 
 CPPFLAGS = @CPPFLAGS@
 LDFLAGS = @LDFLAGS@
-LIBS = @LIBS@
-libutil_a_LIBADD = 
-libutil_a_OBJECTS =  options.o log.o marcdisp.o oid.o wrbuf.o nmemsdup.o \
-xmalloc.o readconf.o tpath.o nmem.o matchstr.o atoin.o
-AR = ar
+libutil_la_LDFLAGS = 
+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@
 COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
 CCLD = $(CC)
-LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@
+LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@
 DIST_COMMON =  Makefile.am Makefile.in
 
 
@@ -104,15 +134,16 @@ 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_a_SOURCES)
-OBJECTS = $(libutil_a_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:
-.SUFFIXES: .S .c .o .s
+.SUFFIXES: .S .c .lo .o .s
 $(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) 
        cd $(top_srcdir) && $(AUTOMAKE) --gnu util/Makefile
 
@@ -121,14 +152,14 @@ Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status $(BUILT_SOURCES)
          && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
 
 
-mostlyclean-noinstLIBRARIES:
+mostlyclean-noinstLTLIBRARIES:
 
-clean-noinstLIBRARIES:
-       -test -z "$(noinst_LIBRARIES)" || rm -f $(noinst_LIBRARIES)
+clean-noinstLTLIBRARIES:
+       -test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES)
 
-distclean-noinstLIBRARIES:
+distclean-noinstLTLIBRARIES:
 
-maintainer-clean-noinstLIBRARIES:
+maintainer-clean-noinstLTLIBRARIES:
 
 .s.o:
        $(COMPILE) -c $<
@@ -146,10 +177,37 @@ distclean-compile:
 
 maintainer-clean-compile:
 
-libutil.a: $(libutil_a_OBJECTS) $(libutil_a_DEPENDENCIES)
-       -rm -f libutil.a
-       $(AR) cru libutil.a $(libutil_a_OBJECTS) $(libutil_a_LIBADD)
-       $(RANLIB) libutil.a
+.s.lo:
+       $(LIBTOOL) --mode=compile $(COMPILE) -c $<
+
+.S.lo:
+       $(LIBTOOL) --mode=compile $(COMPILE) -c $<
+
+mostlyclean-libtool:
+       -rm -f *.lo
+
+clean-libtool:
+       -rm -rf .libs _libs
+
+distclean-libtool:
+
+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)
@@ -270,7 +328,7 @@ install-am: all-am
 install: install-am
 uninstall-am: uninstall-binSCRIPTS
 uninstall: uninstall-am
-all-am: Makefile $(LIBRARIES) $(SCRIPTS)
+all-am: Makefile $(LTLIBRARIES) $(PROGRAMS) $(SCRIPTS)
 all-redirect: all-am
 install-strip:
        $(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install
@@ -287,24 +345,29 @@ distclean-generic:
        -rm -f config.cache config.log stamp-h stamp-h[0-9]*
 
 maintainer-clean-generic:
-mostlyclean-am:  mostlyclean-noinstLIBRARIES mostlyclean-compile \
+mostlyclean-am:  mostlyclean-noinstLTLIBRARIES mostlyclean-compile \
+               mostlyclean-libtool mostlyclean-noinstPROGRAMS \
                mostlyclean-tags mostlyclean-depend mostlyclean-generic
 
 mostlyclean: mostlyclean-am
 
-clean-am:  clean-noinstLIBRARIES clean-compile clean-tags clean-depend \
+clean-am:  clean-noinstLTLIBRARIES clean-compile clean-libtool \
+               clean-noinstPROGRAMS clean-tags clean-depend \
                clean-generic mostlyclean-am
 
 clean: clean-am
 
-distclean-am:  distclean-noinstLIBRARIES distclean-compile \
+distclean-am:  distclean-noinstLTLIBRARIES distclean-compile \
+               distclean-libtool distclean-noinstPROGRAMS \
                distclean-tags distclean-depend distclean-generic \
                clean-am
+       -rm -f libtool
 
 distclean: distclean-am
 
-maintainer-clean-am:  maintainer-clean-noinstLIBRARIES \
-               maintainer-clean-compile maintainer-clean-tags \
+maintainer-clean-am:  maintainer-clean-noinstLTLIBRARIES \
+               maintainer-clean-compile maintainer-clean-libtool \
+               maintainer-clean-noinstPROGRAMS maintainer-clean-tags \
                maintainer-clean-depend maintainer-clean-generic \
                distclean-am
        @echo "This command is intended for maintainers to use;"
@@ -312,11 +375,14 @@ maintainer-clean-am:  maintainer-clean-noinstLIBRARIES \
 
 maintainer-clean: maintainer-clean-am
 
-.PHONY: mostlyclean-noinstLIBRARIES distclean-noinstLIBRARIES \
-clean-noinstLIBRARIES maintainer-clean-noinstLIBRARIES \
+.PHONY: mostlyclean-noinstLTLIBRARIES distclean-noinstLTLIBRARIES \
+clean-noinstLTLIBRARIES maintainer-clean-noinstLTLIBRARIES \
 mostlyclean-compile distclean-compile clean-compile \
-maintainer-clean-compile uninstall-binSCRIPTS install-binSCRIPTS tags \
-mostlyclean-tags distclean-tags clean-tags maintainer-clean-tags \
+maintainer-clean-compile mostlyclean-libtool distclean-libtool \
+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 \
@@ -326,6 +392,8 @@ 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:
Z39.50 C library