ports

commit 02fbba32287eb2699cb38ec8baad11bee7d94272
parent 9187f06c8a96db9f0e518a31e018fa7bc7625be5
Author: Hiltjo Posthuma <hiltjo@codemadness.org>
Date:   Sun, 15 Jun 2014 19:19:10 +0200

improve libjpegturbo, package jpegtran from it

Signed-off-by: Hiltjo Posthuma <hiltjo@codemadness.org>

Diffstat:
M
libjpegturbo/depsinc.mk
 | 
12
++++++++----
M
libjpegturbo/libjpegturbo.mk
 | 
52
+++++++++++++++++++++++++++++++++-------------------

2 files changed, 41 insertions(+), 23 deletions(-)
diff --git a/libjpegturbo/depsinc.mk b/libjpegturbo/depsinc.mk
@@ -1,6 +1,10 @@
 <$libjpegturbo_DEPDIR/v.mk
 
-libjpegturbo_libdir = $libjpegturbo_DEPDIR/libjpeg-turbo-$v/lib/lib/libjpeg-turbo
-libjpegturbo_includedir = $libjpegturbo_DEPDIR/libjpeg-turbo-$v/lib/include/libjpeg-turbo
-DEPS_CFLAGS = $DEPS_CFLAGS -I${libjpegturbo_includedir}
-DEPS_LDFLAGS = $DEPS_LDFLAGS -L${libjpegturbo_libdir} -ljpeg # -lturbojpeg?
+libjpegturbo_libdir = ${libjpegturbo_DEPDIR}/libjpeg-turbo-$v
+libjpegturbo_includedir = ${libjpegturbo_DEPDIR}/libjpeg-turbo-$v
+
+libjpegturbo_CFLAGS = -I${libjpegturbo_includedir}
+libjpegturbo_LDFLAGS = -L${libjpegturbo_libdir} -ljpeg # -lturbojpeg?
+
+DEPS_CFLAGS = $DEPS_CFLAGS ${libjpegturbo_CFLAGS}
+DEPS_LDFLAGS = $DEPS_LDFLAGS ${libjpegturbo_LDFLAGS}
diff --git a/libjpegturbo/libjpegturbo.mk b/libjpegturbo/libjpegturbo.mk
@@ -1,19 +1,33 @@
-TARG = libjpegturbo
-
-<$mkbuild/mk.common-noinst
-
-libjpegturbo:QV:
-	CC="${CC} -static" ./configure \
-		--prefix="$PREFIX" \
-		--mandir="$ROOT/share/man" \
-		--disable-shared \
-		--without-simd \
-		--enable-static \
-		--with-jpeg8 \
-		--includedir="/include/libjpeg-turbo" \
-		--libdir="/lib/libjpeg-turbo" \
-		--program-suffix=-turbo
-	# make and install.
-	make -j$nprocs install DESTDIR=`pwd`/lib
-	# remove .la files for now ?
-	find `pwd`/lib -iname "*.la" -exec rm {} \;
+BIN = jpegtran
+LIB = libjpegturbo.a
+
+INSTALL_BIN = jpegtran
+INSTALL_MAN1 = `{ls -1 *.1}
+
+libjpegturbo_a_OBJ = \
+	jcapimin.o jcapistd.o jccoefct.o jccolor.o \
+	jcdctmgr.o jchuff.o jcinit.o jcmainct.o jcmarker.o jcmaster.o \
+	jcomapi.o jcparam.o jcphuff.o jcprepct.o jcsample.o jctrans.o \
+	jdapimin.o jdapistd.o jdatadst.o jdatasrc.o jdcoefct.o jdcolor.o \
+	jddctmgr.o jdhuff.o jdinput.o jdmainct.o jdmarker.o jdmaster.o \
+	jdmerge.o jdphuff.o jdpostct.o jdsample.o jdtrans.o jerror.o \
+	jfdctflt.o jfdctfst.o jfdctint.o jidctflt.o jidctfst.o jidctint.o \
+	jidctred.o jquant1.o jquant2.o jutils.o jmemmgr.o jmemnobs.o
+
+jpegtran_OBJ = jpegtran.o rdswitch.o cdjpeg.o transupp.o \
+	jcarith.o jdarith.o jaricom.o
+jpegtran_LDFLAGS = -L. -ljpegturbo
+
+<$mkbuild/mk.default
+
+$libjpegturbo_a_OBJ: jconfig.h config.h libjpegsymlink
+
+# makes sure -ljpeg works.
+libjpegsymlink:
+	ln -sf libjpegturbo.a libjpeg.a
+
+jconfig.h:V:
+	cp ../jconfig.h jconfig.h
+
+config.h:V:
+	cp ../config.h config.h