Makefiles: cleaned up definitions for libjpeg library stx-8.0.0
authorJan Vrany <jan.vrany@fit.cvut.cz>
Fri, 06 Oct 2017 09:30:38 +0100
branchstx-8.0.0
changeset 191 92979427f3bb
parent 190 fcf5ed063bb3
child 192 5e372c1fe64c
Makefiles: cleaned up definitions for libjpeg library ...as they were moved to `stx:libview2` (see commit d801dbd5cf3b)
makelib/config-linux-gnu.make
makelib/config.make
--- a/makelib/config-linux-gnu.make	Thu Oct 05 11:15:18 2017 +0100
+++ b/makelib/config-linux-gnu.make	Fri Oct 06 09:30:38 2017 +0100
@@ -129,13 +129,6 @@
 STATIC_EXTRA_LIBS= -lX11 -lXext
 
 X_LIB_DIR=/usr/X11/lib
-JPEGLIB_LD_ARG=
-LIBJPEG_DIR=$(TOP)/support/libjpeg-9
-JPEG_INCLUDE=-I$(LIBJPEG_DIR)
-
-LIBJPEG=$(LIBJPEG_DIR)/.libs/libjpeg.a
-LIBJPEG_FOR_COPY=$(LIBJPEG_DIR)/.libs/libjpeg.a
-LIBJPEG_FOR_LINK=$(LIBJPEG_DIR)/.libs/libjpeg.a
 
 #
 # a netsnmp library
--- a/makelib/config.make	Thu Oct 05 11:15:18 2017 +0100
+++ b/makelib/config.make	Fri Oct 06 09:30:38 2017 +0100
@@ -842,29 +842,6 @@
 SPLINT_DIR=$(TOP)/support/tools/$(SPLINT_VSN)
 # SPLINT=$(SPLINT_DIR)/cscope
 
-#
-# the JPEG library
-#
-# undefine this in arch-specific config, if you cannot compile libjpeg
-# or if you want to link against a system dll
-JPEGREADER_precompiled=JPEGReader.$(O)
-LIBJPEG_CC=$(CC)
-LIBJPEG_OPT=$(OPT)
-
-LIBJPEG_DIR=$(TOP)/support/libjpeg-6a
-# LIBJPEG_DIR=$(TOP)/support/libjpeg-7
-LIBJPEG=$(LIBJPEG_DIR)/libjpeg.a
-LIBJPEG_RULE=$(LIBJPEG)
-LIBJPEG_FOR_COPY=$(LIBJPEG_DIR)/libjpeg.a
-LIBJPEG_FOR_LINK=$(LIBJPEG_DIR)/libjpeg.a
-
-# the following defs are for using the provided (not the system) libjpeg;
-# should work everywhere
-JPEGLIB_LD_ARG=-L$(LIBJPEG_DIR) -ljpeg
-JPEGLIB_MAKE_TARGET=libjpeg
-JPEGREADER_PRELINKED=JPEGReader_prelinked
-JPEG_INCLUDE=
-
 # --------------------------------------------------
 # the MSQL library
 #