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 /nxcomp | |
| 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 'nxcomp')
| -rw-r--r-- | nxcomp/Makefile.in | 19 | ||||
| -rw-r--r-- | nxcomp/configure.in | 5 | ||||
| -rw-r--r-- | nxcomp/nxcomp.pc.in | 15 |
3 files changed, 30 insertions, 9 deletions
diff --git a/nxcomp/Makefile.in b/nxcomp/Makefile.in index 6022747cb..a8647cead 100644 --- a/nxcomp/Makefile.in +++ b/nxcomp/Makefile.in @@ -58,14 +58,15 @@ LIBS = @LIBS@ # Other autoconfigured settings, not used at the moment. # -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@ @@ -292,6 +293,7 @@ install.lib: all $(INSTALL_DATA) $(LIBARCHIVE) $(DESTDIR)${libdir} $(INSTALL_DATA) NX*.h $(DESTDIR)${includedir}/nx $(INSTALL_DATA) MD5.h $(DESTDIR)${includedir}/nx + $(INSTALL_DATA) nxcomp.pc $(DESTDIR)${pkgconfigdir} echo "Running ldconfig tool, this may take a while..." && ldconfig || true install.man: @@ -313,6 +315,7 @@ uninstall.lib: $(RM_FILE) $(DESTDIR)${includedir}/nx/NXrender.h $(RM_FILE) $(DESTDIR)${includedir}/nx/NXvars.h $(RM_FILE) $(DESTDIR)${includedir}/nx/MD5.h + $(RM_FILE) $(DESTDIR)${pkgconfigdir}/nxcomp.pc echo "Running ldconfig tool, this may take a while..." && ldconfig || true uninstall.man: diff --git a/nxcomp/configure.in b/nxcomp/configure.in index 43b51573a..206df2ec7 100644 --- a/nxcomp/configure.in +++ b/nxcomp/configure.in @@ -5,6 +5,9 @@ dnl Prolog AC_INIT(NX.h) AC_PREREQ(2.13) +pkgconfigdir=${libdir}/pkgconfig +AC_SUBST(pkgconfigdir) + dnl Set our default compilation flags. CXXFLAGS="$CXXFLAGS -O3 -fno-rtti -fno-exceptions" @@ -387,4 +390,4 @@ else ALL="\$(LIBFULL) \$(LIBLOAD) \$(LIBSHARED) \$(LIBARCHIVE)" fi -AC_OUTPUT(Makefile) +AC_OUTPUT(Makefile nxcomp.pc) diff --git a/nxcomp/nxcomp.pc.in b/nxcomp/nxcomp.pc.in new file mode 100644 index 000000000..f4d3a7efb --- /dev/null +++ b/nxcomp/nxcomp.pc.in @@ -0,0 +1,15 @@ +prefix=@prefix@ +exec_prefix=@exec_prefix@ +libdir=@libdir@ +includedir=@includedir@ + +Name: nxcomp +Description: NX Compression Library +Version: @VERSION@ +#libjepg does not provide a pkgconfig-file, zlib does not provide it for older versions +#Requires: libjpeg zlib +Requires: libpng +Requires.private: x11 +Cflags: -I${includedir} -I${includedir}/nx +Libs: -L${libdir} -lXcomp + |