Infrastructure: Switch over to pkg-config.

[u/mdw/catacomb] / Makefile.m4

diff --git a/Makefile.m4 b/Makefile.m4
index 812d210..e85d17c 100644 (file)
--- a/Makefile.m4
+++ b/Makefile.m4
@@ -107,7 +107,7 @@ primetab.c: genprimes$(EXEEXT)
 wheel.h: wheel.c
 wheel.c: genwheel$(EXEEXT)
        ./genwheel -h wheel.h -c wheel.c \
-               -s CATACOMB_WHEEL_H -n 5
+               -s CATACOMB_WHEEL_H -n 5 \
                -t "unsigned char" -i wheel
 
 archinclude_HEADERS = mptypes.h mplimits.h
@@ -163,7 +163,8 @@ BUILT_SOURCES = \
 
 lib_LTLIBRARIES = libcatacomb.la
 
-libcatacomb_la_LDFLAGS = -version-info 3:0:1
+libcatacomb_la_LIBADD = $(CATACOMB_LIBS)
+libcatacomb_la_LDFLAGS = -version-info 3:1:1
 ## Middle number is the patchlevel.  Final number is the minor version.  The
 ## difference between the first and last numbers is major version.
 
@@ -277,7 +278,8 @@ bin_PROGRAMS = \
        dsig key pixie cookie rspit factorial hashsum mkphrase \
        catcrypt catsign
 noinst_LIBRARIES = libcatcrypt.a
-bin_SCRIPTS = catacomb-config xpixie
+pkgconfigdir = $(libdir)/pkgconfig
+pkgconfig_DATA = catacomb.pc
 noinst_PROGRAMS = \
        genprimes genwheel mptypes genlimits serpent-check bittest mpdump \
        perftest \
@@ -303,7 +305,7 @@ rspit_SOURCES = rspit.c
 factorial_SOURCES = factorial.c
 perftest_SOURCES = perftest.c
 pixie_SOURCES = pixie.c pixie-common.c lmem.c arena.c passphrase.c
-pixie_LDADD =
+pixie_LDADD = $(PIXIE_LIBS)
 pixie_CFLAGS = $(AM_CFLAGS)
 mkphrase_SOURCES = mkphrase.c
 bittest_SOURCES = bittest.c