diff options
| author | bustico | 2014-12-23 09:35:46 +0000 |
|---|---|---|
| committer | bustico | 2014-12-23 09:35:46 +0000 |
| commit | 2d66c27090d6654bbda21f7cc8351b9a64f9b4f9 (patch) | |
| tree | cc60f48c22011cd150c13ed9a7133b0ee937affc /src/Makefile | |
| parent | 538b53a4a610b3a9cf24c3108ab14cf36377a532 (diff) | |
| download | ivy-c-2d66c27090d6654bbda21f7cc8351b9a64f9b4f9.zip ivy-c-2d66c27090d6654bbda21f7cc8351b9a64f9b4f9.tar.gz ivy-c-2d66c27090d6654bbda21f7cc8351b9a64f9b4f9.tar.bz2 ivy-c-2d66c27090d6654bbda21f7cc8351b9a64f9b4f9.tar.xz | |
Author: Piotr Esden-Tempski <piotr@esden.net>
Date: Mon Dec 22 18:54:08 2014 -0800
Added toplevel README.md file.
Author: Piotr Esden-Tempski <piotr@esden.net>
Date: Mon Dec 22 18:38:50 2014 -0800
Added missing LIB variable for Makefile.osx
Date: Mon Dec 22 18:30:20 2014 -0800
Bumped version.
Author: Piotr Esden-Tempski <piotr@esden.net>
Date: Mon Dec 22 18:15:14 2014 -0800
Switched from explicit naming of *.pc files to wildcard.
Author: Piotr Esden-Tempski <piotr@esden.net>
Date: Mon Dec 22 18:06:52 2014 -0800
A bunch of pkg-config file improvements.
- Automatically finding *.pc.in files and running pattern replacements
on them.
- Replaced static paths in ivy.pc.in with @@ patterns.
- Removed @DESTDIR@ as this path should not appear in any of the
installed files, it is only used to direct the build system where to
put the files. See deb package build process.
- Moved LIB variables to Libs and INC to Cflags.
- pkgconfiginstall target now depends on pkgconfig target. Otherwise the
*.pc files might not be generated when make install is invoked.
- Added missing MAJOR and MINOR variable definitions in Makefile.osx.
Author: Piotr Esden-Tempski <piotr@esden.net> Date: Mon Dec 22 17:23:54 2014 -0800
Updated the ivy pkgconfig to use the same patterns as the glib one.
Author: Felix Ruess <felix.ruess@gmail.com> Date: Fri Nov 14 15:06:18 2014 +0100 add pkg-config file for ivy
Author: Piotr Esden-Tempski <piotr@esden.net> Date: Mon Dec 22 03:48:57 2014 -0800 Fixing the format security warning. The warning is a valid security issue, allowing for access to memory regions not intended for public use. For reference please see: https://fedoraproject.org/wiki/Format-Security-FAQ
Diffstat (limited to 'src/Makefile')
| -rw-r--r-- | src/Makefile | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/src/Makefile b/src/Makefile index a2b8298..193ffc8 100644 --- a/src/Makefile +++ b/src/Makefile @@ -17,7 +17,7 @@ # change this in version.h too !!!! MAJOR=3 -MINOR=14 +MINOR=15 PERHAPS64 := $(shell getconf LONG_BIT | perl -ne "print /64/ ? '64' : '';") LIB = /lib$(PERHAPS64) @@ -241,8 +241,7 @@ libtclivy.so.$(MAJOR).$(MINOR): $(TCLOBJ) distclean: clean clean: - -rm -f $(TARGETS) $(TARGETLIBS) *.o *.a *.so *.so.* *~ - -rm -f ivy-glib.pc + -rm -f $(TARGETS) $(TARGETLIBS) *.o *.a *.so *.so.* *~ *.pc @(cd $(TOOLS_DIR) && $(MAKE) clean) @@ -331,9 +330,11 @@ tools_omp: libomp rpm:: /usr/bin/rpmize -pkgconf: - sed -e 's,@PREFIX@,$(PREFIX),; s,@DESTDIR@,$(DESTDIR),; s,@MAJOR@,$(MAJOR),; s,@MINOR@,$(MINOR),; s,@PCREINC@,$(PCREINC),; s,@REGEXP@,$(REGEXP),; s,@PCRELIB@,$(PCRELIB),; s,@EXTRALIB@,$(EXTRALIB),' ivy-glib.pc.in > ivy-glib.pc +pkgconf: + for f in *.pc.in ; do \ + sed -e 's,@PREFIX@,$(PREFIX),; s,@MAJOR@,$(MAJOR),; s,@MINOR@,$(MINOR),; s,@PCREINC@,$(PCREINC),; s,@REGEXP@,$(REGEXP),; s,@PCRELIB@,$(PCRELIB),; s,@EXTRALIB@,$(EXTRALIB),' $$f > $$(echo $$f | cut -f 1,2 -d .); \ + done -installpkgconf: +installpkgconf: pkgconf test -d $(DESTDIR)$(PREFIX)/lib/pkgconfig || mkdir -p $(DESTDIR)$(PREFIX)/lib/pkgconfig - install -m 644 ivy-glib.pc $(DESTDIR)$(PREFIX)/lib/pkgconfig + install -m 644 *.pc $(DESTDIR)$(PREFIX)/lib/pkgconfig |