Unbundle: libfreeimage from C++ library.

diff --git a/Makefile.fip b/Makefile.fip
index f4336d2..4831af7 100644 (file)
--- a/Makefile.fip
+++ b/Makefile.fip
@@ -11,7 +11,8 @@ INSTALLDIR ?= $(DESTDIR)/usr/lib
 # Converts cr/lf to just lf
 DOS2UNIX = dos2unix
 
-LIBRARIES = -lstdc++
+INCLUDE += -ISource
+LIBRARIES = -lstdc++ -lfreeimage-$(VER_MAJOR).$(VER_MINOR) -L.
 
 MODULES = $(SRCS:.c=.o)
 MODULES := $(MODULES:.cpp=.o)

diff --git a/genfipsrclist.sh b/genfipsrclist.sh
index 0c6eac5..d2aec92 100644 (file)
--- a/genfipsrclist.sh
+++ b/genfipsrclist.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 Wrapper/FreeImagePlus"
+DIRLIST="Wrapper/FreeImagePlus"
 
 
 echo "VER_MAJOR = 3" > fipMakefile.srcs