diff options
| author | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2015-07-14 00:04:01 +0200 |
|---|---|---|
| committer | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2015-07-14 00:04:01 +0200 |
| commit | e5fbb11b2d56f5d170aeba4b3aaea62a76ce1086 (patch) | |
| tree | c9c6928aeac3183ea888bf68b2a31bc68ff7302a /nxcompext | |
| parent | f4c07c07760c33bf7bc908e2d45aee4c4f73f088 (diff) | |
| parent | 00cec4924157db9498d56e5c1fbde852e8eb3717 (diff) | |
| download | nx-libs-e5fbb11b2d56f5d170aeba4b3aaea62a76ce1086.tar.gz nx-libs-e5fbb11b2d56f5d170aeba4b3aaea62a76ce1086.tar.bz2 nx-libs-e5fbb11b2d56f5d170aeba4b3aaea62a76ce1086.zip | |
Merge branch 'uli42-pr/add_pkgconfig' into 3.6.x
Attributes GH PR #62: https://github.com/ArcticaProject/nx-libs/pull/62
Diffstat (limited to 'nxcompext')
| -rw-r--r-- | nxcompext/Makefile.in | 19 | ||||
| -rw-r--r-- | nxcompext/configure.in | 5 | ||||
| -rw-r--r-- | nxcompext/nxcompext.pc.in | 13 |
3 files changed, 28 insertions, 9 deletions
diff --git a/nxcompext/Makefile.in b/nxcompext/Makefile.in index b33c5aaf3..b66a4c361 100644 --- a/nxcompext/Makefile.in +++ b/nxcompext/Makefile.in @@ -50,14 +50,15 @@ LIBS = @LIBS@ -lz -lNX_X11 -lXcomp # LIBS = @LIBS@ -lz -ljpeg -lpthread -lNX_X11 -lXcomp # -srcdir = @srcdir@ -prefix = @prefix@ -exec_prefix = @exec_prefix@ -bindir = @bindir@ -man1dir = @mandir@/man1 -VPATH = @srcdir@ -libdir = @libdir@ -includedir = @includedir@ +srcdir = @srcdir@ +prefix = @prefix@ +exec_prefix = @exec_prefix@ +bindir = @bindir@ +man1dir = @mandir@/man1 +VPATH = @srcdir@ +libdir = @libdir@ +includedir = @includedir@ +pkgconfigdir = @pkgconfigdir@ INSTALL = @INSTALL@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ @@ -171,6 +172,7 @@ install.lib: all $(INSTALL_LINK) $(LIBLOAD) $(DESTDIR)${libdir} $(INSTALL_LINK) $(LIBSHARED) $(DESTDIR)${libdir} $(INSTALL_DATA) NX*.h $(DESTDIR)${includedir}/nx + $(INSTALL_DATA) nxcompext.pc $(DESTDIR)${pkgconfigdir} echo "Running ldconfig tool, this may take a while..." && ldconfig || true install.man: @@ -185,6 +187,7 @@ uninstall.lib: $(RM_FILE) $(DESTDIR)${libdir}/$(LIBSHARED) $(RM_FILE) $(DESTDIR)${includedir}/nx/NXlib.h $(RM_FILE) $(DESTDIR)${includedir}/nx/NXlibint.h + $(RM_FILE) $(DESTDIR)${pkgconfigdir}/nxcompext.pc echo "Running ldconfig tool, this may take a while..." && ldconfig || true uninstall.man: diff --git a/nxcompext/configure.in b/nxcompext/configure.in index e6f13c0ea..eb6604dba 100644 --- a/nxcompext/configure.in +++ b/nxcompext/configure.in @@ -5,6 +5,9 @@ dnl Prolog AC_INIT(NXlib.h) AC_PREREQ(2.13) +pkgconfigdir=${libdir}/pkgconfig +AC_SUBST(pkgconfigdir) + dnl Reset default compilation flags. CXXFLAGS="$CXXFLAGS -O3" @@ -243,4 +246,4 @@ else ALL="\$(LIBFULL) \$(LIBLOAD) \$(LIBSHARED) \$(LIBARCHIVE)" fi -AC_OUTPUT(Makefile) +AC_OUTPUT(Makefile nxcompext.pc) diff --git a/nxcompext/nxcompext.pc.in b/nxcompext/nxcompext.pc.in new file mode 100644 index 000000000..669397af6 --- /dev/null +++ b/nxcompext/nxcompext.pc.in @@ -0,0 +1,13 @@ +prefix=@prefix@ +exec_prefix=@exec_prefix@ +libdir=@libdir@ +includedir=@includedir@ + +Name: nxcompext +Description: Extension for NX Compression Library +Version: @VERSION@ +Requires: nxcomp +Requires.private: x11 +Cflags: -I${includedir} -I${includedir}/nx +Libs: -L${libdir} -lXcompext + |