# HG changeset patch
# User Claus Gittinger <cg@exept.de>
# Date 1359138086 -3600
# Node ID 0d3bcf933f8d8383ca41bb196ef392263ac9a6bd
# Parent  b4301c548ff1c235b51c32048fee890029ff659b
LIBJPEG rule

diff -r b4301c548ff1 -r 0d3bcf933f8d Make.proto
--- a/Make.proto	Fri Jan 25 15:08:48 2013 +0100
+++ b/Make.proto	Fri Jan 25 19:21:26 2013 +0100
@@ -1,4 +1,4 @@
-# $Header: /cvs/stx/stx/libview2/Make.proto,v 1.135 2013-01-25 12:26:04 stefan Exp $
+# $Header: /cvs/stx/stx/libview2/Make.proto,v 1.136 2013-01-25 18:21:26 cg Exp $
 #
 # DO NOT EDIT
 # automagically generated from the projectDefinition: stx_libview2.
@@ -73,7 +73,7 @@
 #
 # prelink JPEGReader.o with libjpeg
 #
-JPEGReader_prelinked: $(LIBJPEG)
+JPEGReader_prelinked: $(LIBJPEG_RULE)
 	@$(MAKE) JPEGReader.$(O) \
 		CC="$(LIBJPEG_CC)" \
 		OPT="$(LIBJPEG_OPT)" \
@@ -94,8 +94,8 @@
 	    echo; \
 	fi
 
-$(LIBJPEG): $(LIBJPEG_DIR)/.libs/libjpeg.a
-	cp $(LIBJPEG_DIR)/.libs/libjpeg.a $(LIBJPEG)
+# LIBJPEG_RULE is either $(LIBJPEG) or $(LIBJPEG_DIR)/.libs/libjpeg.a (for linux-elf)
+
 
 $(LIBJPEG_DIR)/.libs/libjpeg.a: $(LIBJPEG_DIR)/Makefile $(LIBJPEG_DIR)/*.c $(LIBJPEG_DIR)/*.h
 	@-echo
@@ -103,6 +103,7 @@
 	@-echo
 	cd $(LIBJPEG_DIR) \
 	    && $(MAKE) all CC="$(LIBJPEG_CC)" OPT="$(LIBJPEG_OPT)" CFLAGS="$(LIBJPEG_OPT) $(CCCONFOPT)"
+	cp $(LIBJPEG_DIR)/.libs/libjpeg.a $(LIBJPEG)
 	@-echo
 
 $(LIBJPEG_DIR)/Makefile: