From b98d666c174ae7380feb7a6a384dd54631bb5d1f Mon Sep 17 00:00:00 2001 From: =?utf8?q?Franti=C5=A1ek=20Dvo=C5=99=C3=A1k?= Date: Tue, 14 Jan 2014 10:59:23 +0100 Subject: [PATCH] Unbundle: update build system. --- Makefile.gnu | 4 ++-- gensrclist.sh | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Makefile.gnu b/Makefile.gnu index 0c967b8..2edf0ef 100644 --- a/Makefile.gnu +++ b/Makefile.gnu @@ -11,8 +11,8 @@ INSTALLDIR ?= $(DESTDIR)/usr/lib # Converts cr/lf to just lf DOS2UNIX = dos2unix -LIBRARIES = -lstdc++ - +INCLUDE += $(shell pkg-config --cflags libopenjpeg libpng libraw OpenEXR zlib libtiff-4) +LIBRARIES = -lstdc++ $(shell pkg-config --libs libopenjpeg libpng libraw libraw OpenEXR zlib libtiff-4) -ljpeg MODULES = $(SRCS:.c=.o) MODULES := $(MODULES:.cpp=.o) CFLAGS ?= -O3 -fPIC -fexceptions -fvisibility=hidden -DNO_LCMS diff --git a/gensrclist.sh b/gensrclist.sh index 3b32682..329a7cb 100644 --- a/gensrclist.sh +++ b/gensrclist.sh @@ -1,6 +1,6 @@ #!/bin/sh -DIRLIST=". Source Source/Metadata Source/FreeImageToolkit Source/LibJPEG Source/LibPNG Source/LibTIFF4 Source/ZLib Source/LibOpenJPEG Source/OpenEXR Source/OpenEXR/Half Source/OpenEXR/Iex Source/OpenEXR/IlmImf Source/OpenEXR/IlmThread Source/OpenEXR/Imath Source/LibRawLite Source/LibRawLite/dcraw Source/LibRawLite/internal Source/LibRawLite/libraw Source/LibRawLite/src" +DIRLIST=". Source Source/Metadata Source/FreeImageToolkit" echo "VER_MAJOR = 3" > Makefile.srcs echo "VER_MINOR = 15.4" >> Makefile.srcs -- 1.8.2.3