Modified yaz-config so that it only reports usage when bad options

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

diff --git a/lib/Makefile.in b/lib/Makefile.in
index 1ba542d..8c85394 100644 (file)
--- a/lib/Makefile.in
+++ b/lib/Makefile.in
@@ -74,6 +74,7 @@ NM = @NM@
 OBJDUMP = @OBJDUMP@
 PACKAGE = @PACKAGE@
 RANLIB = @RANLIB@
+READLINE_LIBS = @READLINE_LIBS@
 SUBDIRS_VAR = @SUBDIRS_VAR@
 VERSION = @VERSION@
 
@@ -81,6 +82,8 @@ lib_LTLIBRARIES = libyaz.la
 
 bin_SCRIPTS = yaz-config
 
+EXTRA_DIST = yaz-config.in
+
 # If the line below is omitted the LINK variable is
 # not set in Makefile.in and it will NOT work ..
 EXTRA_libyaz_la_SOURCES = x.c
@@ -90,14 +93,10 @@ libyaz_la_SOURCES =
 
 LDFLAGS = -version-info 0:0:0
 
-libyaz_la_LIBADD = ../odr/libodr.la ../@ASNMODULE@/libasn.la  ../comstack/libcomstack.la ../server/libserver.la  ../zutil/libzutil.la ../util/libutil.la ../ccl/libccl.la  ../retrieval/libret.la @ILLLIB@
-
+libyaz_la_LIBADD = ../odr/libodr.la ../$(ASNMODULE)/libasn.la  ../comstack/libcomstack.la ../server/libserver.la  ../zutil/libzutil.la ../util/libutil.la ../ccl/libccl.la  ../retrieval/libret.la $(ILLLIB)
 
-#  Public libraries and header files
-LIBDIR = $(exec_prefix)/lib
-INCDIR = $(prefix)/include
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-CONFIG_CLEAN_FILES = 
+CONFIG_CLEAN_FILES =  yaz-config
 LTLIBRARIES =  $(lib_LTLIBRARIES)
 
 
@@ -105,7 +104,7 @@ DEFS = @DEFS@ -I. -I$(srcdir)
 CPPFLAGS = @CPPFLAGS@
 LIBS = @LIBS@
 libyaz_la_LDFLAGS = 
-libyaz_la_DEPENDENCIES =  ../odr/libodr.la ../@ASNMODULE@/libasn.la \
+libyaz_la_DEPENDENCIES =  ../odr/libodr.la ../$(ASNMODULE)/libasn.la \
 ../comstack/libcomstack.la ../server/libserver.la ../zutil/libzutil.la \
 ../util/libutil.la ../ccl/libccl.la ../retrieval/libret.la
 libyaz_la_OBJECTS = 
@@ -116,7 +115,7 @@ COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CF
 LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
 CCLD = $(CC)
 LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@
-DIST_COMMON =  Makefile.am Makefile.in
+DIST_COMMON =  Makefile.am Makefile.in yaz-config.in
 
 
 DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
@@ -137,6 +136,8 @@ Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status $(BUILT_SOURCES)
        cd $(top_builddir) \
          && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
 
+yaz-config: $(top_builddir)/config.status yaz-config.in
+       cd $(top_builddir) && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
 
 mostlyclean-libLTLIBRARIES:
 
@@ -377,15 +378,6 @@ distclean-generic clean-generic maintainer-clean-generic clean \
 mostlyclean distclean maintainer-clean
 
 
-yaz-config: Makefile
-       @echo "#!/bin/sh" >yaz-config
-       @echo "# YAZ settings for developers" >>yaz-config
-       @echo "YAZBIN='$(bindir)'" >>yaz-config
-       @echo "YAZTAB='$(pkgdatadir)/tab'" >>yaz-config
-       @echo "YAZLIB='-L$(libdir) -lyaz $(LIBS)'" >>yaz-config
-       @echo "YAZINC='-I$(includedir)'" >>yaz-config
-       chmod +x yaz-config
-
 # 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: