Build: Put build utilities in the config/ subdirectory.

[mLib] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 5feca10b062543f10b5bbbe12b2dba45c6bc55a9..131a94c9b139d9c5c55675ba2f0e08fcb1d9b9ec 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -15,12 +15,12 @@
 ## it under the terms of the GNU Library General Public License as
 ## published by the Free Software Foundation; either version 2 of the
 ## License, or (at your option) any later version.
-## 
+##
 ## mLib is distributed in the hope that it will be useful,
 ## but WITHOUT ANY WARRANTY; without even the implied warranty of
 ## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 ## GNU Library General Public License for more details.
-## 
+##
 ## You should have received a copy of the GNU Library General Public
 ## License along with mLib; if not, write to the Free
 ## Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
@@ -33,13 +33,13 @@ AUTOMAKE_OPTIONS = foreign
 ## --- What to build ---
 
 SUBDIRS = man
-
-bin_SCRIPTS = mLib-config
 bin_PROGRAMS = crc-mktab unihash-mkstatic
 
 lib_LTLIBRARIES = libmLib.la
 pkglibexecdir = $(libexecdir)/$(PACKAGE)
 pkglibexec_PROGRAMS = @BRES_LIBEXEC@
+pkgconfigdir = $(libdir)/pkgconfig
+pkgconfig_DATA = mLib.pc
 EXTRA_PROGRAMS = bres
 
 pkginclude_HEADERS = \
@@ -56,7 +56,7 @@ pkginclude_HEADERS = \
 
 ## --- Things to put in the library ---
 
-libmLib_la_LDFLAGS = -version-info 2:3:0
+libmLib_la_LDFLAGS = -version-info 2:5:0
 ## Middle number is the patchlevel.  Final number is the minor version.  The
 ## difference between the first and last numbers is major version.
 
@@ -101,11 +101,11 @@ unihash_mkstatic_CFLAGS = $(AM_CFLAGS)
 
 ## --- Test code ---
 
-noinst_PROGRAMS = da.t sym.t assoc.t bits.t
+noinst_PROGRAMS = da.t sym.t assoc.t bits.t versioncmp.t
 
 check: \
        da.test sym.test assoc.test bits.test base64.test hex.test \
-       base32.test \
+       base32.test versioncmp.test \
        unihash.test
 
 da_t_SOURCES = da-test.c
@@ -152,6 +152,14 @@ bits.o: bits.c
 bits.test: bits.t
        ./bits.t -f $(srcdir)/bits.in
 
+versioncmp_t_SOURCES = versioncmp-test.c
+versioncmp_t_LDADD = libmLib.la
+versioncmp_t_LDFLAGS = -static
+versioncmp-test.o: versioncmp-test.c
+       $(COMPILE) -c -DSRCDIR="\"$(srcdir)\"" $(srcdir)/versioncmp-test.c -o $@
+versioncmp.test: versioncmp.t
+       ./versioncmp.t -f $(srcdir)/versioncmp.in
+
 base64.to: base64.c
        $(COMPILE) -c -DTEST_RIG -DSRCDIR=\"$(srcdir)\" \
                $(srcdir)/base64.c -o base64.to
@@ -214,6 +222,7 @@ TEST_DIST = \
        sym-gtest sym-ref \
        bits.in bits-testgen.c \
        unihash-check.pl unihash.in \
+       versioncmp.in \
        base64.in base64.ref base32.in base32.ref hex.in hex.ref
 
 ## --- Background resolver ---
@@ -237,7 +246,7 @@ uninstall-man:
 CLEANFILES = $(TEST_CLEAN) crc32-tab.c unihash-global.c
 DISTCLEANFILES = libtool
 EXTRA_DIST = \
-       $(TEST_DIST) maninst \
+       $(TEST_DIST) config/maninst \
        debian/rules debian/copyright debian/control debian/changelog
 
 ##----- That's all, folks ---------------------------------------------------