src/libsanlock_client.pc.in src/libsanlock.pc.in src/Makefile

[David Teigland]

src/Makefile                |   18 +++++++++++++++---
 src/libsanlock.pc.in        |   11 +++++++++++
 src/libsanlock_client.pc.in |   11 +++++++++++
 3 files changed, 37 insertions(+), 3 deletions(-)

New commits:
commit d24027f7c7ba21d431f143932b22e1a7c8600de7
Author: David Teigland 
Date:   Wed May 20 13:32:55 2015 -0500

sanlock: add pkgconfig files

diff --git a/src/Makefile b/src/Makefile
index abc53cb..1339506 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -13,6 +13,8 @@ SOMINOR=0

LIB_ENTIRE_TARGET = libsanlock
 LIB_CLIENT_TARGET = libsanlock_client
+LIBPC_ENTIRE_TARGET = libsanlock.pc
+LIBPC_CLIENT_TARGET = libsanlock_client.pc
 LIBSO_ENTIRE_TARGET = $(LIB_ENTIRE_TARGET).so.$(SOMAJOR).$(SOMINOR)
 LIBSO_CLIENT_TARGET = $(LIB_CLIENT_TARGET).so.$(SOMAJOR).$(SOMINOR)

@@ -55,6 +57,9 @@ LIB_CLIENT_SOURCE = \
    client.c \
    sanlock_sock.c

+LIBPC_ENTIRE_SOURCE = libsanlock.pc.in
+LIBPC_CLIENT_SOURCE = libsanlock_client.pc.in
+
 OPTIMIZE_FLAG = -O2 -Wp,-D_FORTIFY_SOURCE=2
 ifeq ($(DEBUG), 1)
    OPTIMIZE_FLAG = -O0
@@ -98,7 +103,7 @@ LIB_ENTIRE_LDFLAGS += -Wl,-z,relro -pie

LIB_CLIENT_LDFLAGS += -Wl,-z,relro -pie

-all: $(LIBSO_ENTIRE_TARGET) $(LIBSO_CLIENT_TARGET) $(CMD_TARGET)
+all: $(LIBSO_ENTIRE_TARGET) $(LIBSO_CLIENT_TARGET) $(CMD_TARGET) $(LIBPC_ENTIRE_TARGET) $(LIBPC_CLIENT_TARGET)

$(LIBSO_ENTIRE_TARGET): $(LIB_ENTIRE_SOURCE)
    $(CC) $(CFLAGS) $(LIB_ENTIRE_LDFLAGS) -shared -fPIC -o $@ -Wl,-soname=$(LIB_ENTIRE_TARGET).so.$(SOMAJOR) $^
@@ -113,9 +118,14 @@ $(LIBSO_CLIENT_TARGET): $(LIB_CLIENT_SOURCE)
 $(CMD_TARGET): $(LIBSO_ENTIRE_TARGET) $(CMD_SOURCE)
    $(CC) $(CMD_CFLAGS) $(CMD_LDFLAGS) $(CMD_SOURCE) $(CMD_LDADD) -o $@ -L.

-clean:
-	rm -f *.o *.so *.so.* $(CMD_TARGET)
+$(LIBPC_ENTIRE_TARGET): $(LIBPC_ENTIRE_SOURCE)
+	sed -e "s/@VERSION@/$(VER)/" $(LIBPC_ENTIRE_SOURCE) > $(LIBPC_ENTIRE_TARGET)

+$(LIBPC_CLIENT_TARGET): $(LIBPC_CLIENT_SOURCE)
+	sed -e "s/@VERSION@/$(VER)/" $(LIBPC_CLIENT_SOURCE) > $(LIBPC_CLIENT_TARGET)
+
+clean:
+	rm -f *.o *.so *.so.* $(CMD_TARGET) $(LIBSO_ENTIRE_TARGET) $(LIBSO_CLIENT_TARGET) $(LIBPC_ENTIRE_TARGET) $(LIBPC_CLIENT_TARGET)

INSTALL=$(shell which install)

@@ -134,6 +144,8 @@ install: all
    $(INSTALL) -c -m 755 $(CMD_TARGET) $(DESTDIR)/$(BINDIR)
    $(INSTALL) -c -m 755 $(LIBSO_ENTIRE_TARGET) $(DESTDIR)/$(LIBDIR)
    $(INSTALL) -c -m 755 $(LIBSO_CLIENT_TARGET) $(DESTDIR)/$(LIBDIR)
+	$(INSTALL) -c -m 644 $(LIBPC_ENTIRE_TARGET) $(DESTDIR)/$(LIBDIR)/pkgconfig
+	$(INSTALL) -c -m 644 $(LIBPC_CLIENT_TARGET) $(DESTDIR)/$(LIBDIR)/pkgconfig
    cp -a $(LIB_ENTIRE_TARGET).so $(DESTDIR)/$(LIBDIR)
    cp -a $(LIB_CLIENT_TARGET).so $(DESTDIR)/$(LIBDIR)
    cp -a $(LIB_ENTIRE_TARGET).so.$(SOMAJOR) $(DESTDIR)/$(LIBDIR)
diff --git a/src/libsanlock.pc.in b/src/libsanlock.pc.in
new file mode 100644
index 0000000..4cbe0b5
--- /dev/null
+++ b/src/libsanlock.pc.in
@@ -0,0 +1,11 @@
+prefix=/usr
+exec_prefix=${prefix}
+includedir=${prefix}/include
+libdir=${exec_prefix}/lib64
+
+Name: libsanlock
+Description: The sanlock library
+Version: @VERSION@
+Cflags: -I${includedir}
+Libs: -L${libdir} -lpthread -lrt -laio -lblkid -luuid -lwdmd -lsanlock
+
diff --git a/src/libsanlock_client.pc.in b/src/libsanlock_client.pc.in
new file mode 100644
index 0000000..dcb877b
--- /dev/null
+++ b/src/libsanlock_client.pc.in
@@ -0,0 +1,11 @@
+prefix=/usr
+exec_prefix=${prefix}
+includedir=${prefix}/include
+libdir=${exec_prefix}/lib64
+
+Name: libsanlock_client
+Description: The sanlock client library
+Version: @VERSION@
+Cflags: -I${includedir}
+Libs: -L${libdir} -lsanlock_client
+