author | Florian Forster <ff@octo.it> | |
Thu, 25 Sep 2014 00:22:44 +0000 (17:22 -0700) | ||
committer | Florian Forster <ff@octo.it> | |
Thu, 25 Sep 2014 00:22:44 +0000 (17:22 -0700) |
minor build system tweaks, to generate oping.pc file for pkg-config oping
.gitignore | patch | blob | history | |
autogen.sh | patch | blob | history | |
configure.ac | patch | blob | history | |
src/Makefile.am | patch | blob | history |
diff --git a/.gitignore b/.gitignore
index e39f4fb7a399e15c738d7e87cb7e80205f194686..c8c5e41d24e5008bcc7a4b9bb403db986e722879 100644 (file)
--- a/.gitignore
+++ b/.gitignore
src/mans/*.8
src/oping
src/noping
+src/oping.pc
*.bs
*.la
*.lo
diff --git a/autogen.sh b/autogen.sh
index f273d647ecd3dc6a0611c0ef82e7fef3ee6e98f3..6a5d62d2fc6452bd642ed5a6129abba0d40b7ec9 100755 (executable)
--- a/autogen.sh
+++ b/autogen.sh
#!/bin/sh
-libtoolize
-aclocal -I m4
-autoheader
-automake --add-missing
-autoconf
+set -e
+
+autoreconf --warnings=all --install
echo "autoconfiguration done, to build: ./configure ; make"
diff --git a/configure.ac b/configure.ac
index f9be869823222ccc4ea30ccdb8dadd37c502e345..6e775e2bb9db9d9871762ec0c52cea262a50c1da 100644 (file)
--- a/configure.ac
+++ b/configure.ac
# Process this file with autoconf to produce a configure script.
AC_PREREQ([2.65])
-AC_INIT([liboping],[1.6.2])
+AC_INIT([liboping],[1.6.2],[ff@octo.it],,[http://github.com/octo/liboping/])
AC_CONFIG_SRCDIR([src/liboping.c])
AC_CONFIG_HEADERS([src/config.h])
AC_CONFIG_MACRO_DIR([m4])
# configure libtool
LT_INIT([dlopen])
+# pkg-config interface
+PKG_INSTALLDIR
+
# Checks for header files.
AC_HEADER_STDC
AC_HEADER_TIME
diff --git a/src/Makefile.am b/src/Makefile.am
index 844e0a4d0eefe569c6cacca3fb3ee4be248d4026..65d7adbe63f119f030247fc42d368e5d5f8842eb 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
liboping_la_LIBADD += -lxnet
endif
+oping.pc:
+ echo 'prefix=$(prefix)' > $@
+ echo 'exec_prefix=$(exec_prefix)' >> $@
+ echo 'includedir=$(includedir)' >> $@
+ echo 'libdir=$(libdir)' >> $@
+ echo >> $@
+ echo 'Name: $(PACKAGE_TARNAME)' >> $@
+ echo 'Description: $(PACKAGE_NAME)' >> $@
+ echo 'URL: $(PACKAGE_URL)' >> $@
+ echo 'Version: $(PACKAGE_VERSION)' >> $@
+ echo 'Cflags: -I${includedir}' >> $@
+ echo 'Libs: -L${libdir} -loping' >> $@
+ echo 'Libs.private: $(AM_LDFLAGS) $(LIBS) $(liboping_la_LIBADD)' >> $@
+
+pkgconfig_DATA = oping.pc
+
+MOSTLYCLEANFILES = $(pkgconfig_DATA)
+
bin_PROGRAMS = oping
oping_SOURCES = oping.c