Make.proto
changeset 2049 d9c6f22084b9
parent 1855 f66cc1d897e6
child 2153 81f1c95a053b
--- a/Make.proto	Fri Jul 01 19:09:46 2005 +0200
+++ b/Make.proto	Tue Jul 05 20:12:46 2005 +0200
@@ -1,4 +1,4 @@
-# $Header: /cvs/stx/stx/libview2/Make.proto,v 1.89 2003-11-21 19:38:56 cg Exp $
+# $Header: /cvs/stx/stx/libview2/Make.proto,v 1.90 2005-07-05 18:12:46 cg Exp $
 #
 # -------------- no need to change anything below ----------
 
@@ -51,6 +51,7 @@
 	    echo; \
 	    echo "prelinking JPEGReader with libjpg ..."; \
 	    echo; \
+	    echo ld $(LD_REL_FLAG) -o JPEGReader.$(O) __JPEGReader.$(O) $(LIBJPEG); \
 	    ld $(LD_REL_FLAG) -o JPEGReader.$(O) __JPEGReader.$(O) $(LIBJPEG); \
 	    rm -f __JPEGReader.$(O); \
 	    echo; \
@@ -60,7 +61,7 @@
 	@-echo
 	@-echo "making libjpg support library ..."
 	@-echo
-	-(cd $(LIBJPEG_DIR) ; $(MAKE) libjpeg.a CC="$(LIBJPEG_CC)" OPT="$(LIBJPEG_OPT)" CFLAGS="$(LIBJPEG_OPT)")
+	-(cd $(LIBJPEG_DIR) ; $(MAKE) libjpeg.a CC="$(LIBJPEG_CC)" OPT="$(LIBJPEG_OPT)" CFLAGS="$(LIBJPEG_OPT) $(CCCONFOPT)")
 	@-echo
 
 Makefiles::