Make.proto
changeset 3092 fbe40b7e8c08
parent 3090 7568556aba55
child 3093 f9621cb33f6e
--- a/Make.proto	Fri Feb 08 13:49:41 2013 +0100
+++ b/Make.proto	Sun Feb 10 16:26:52 2013 +0100
@@ -1,4 +1,4 @@
-# $Header: /cvs/stx/stx/libview2/Make.proto,v 1.137 2013-02-06 16:05:30 vrany Exp $
+# $Header: /cvs/stx/stx/libview2/Make.proto,v 1.138 2013-02-10 15:26:52 cg Exp $
 #
 # DO NOT EDIT
 # automagically generated from the projectDefinition: stx_libview2.
@@ -96,9 +96,17 @@
 
 # LIBJPEG_RULE is either $(LIBJPEG) or $(LIBJPEG_DIR)/.libs/libjpeg.a (for linux-elf)
 
-$(LIBJPEG): $(LIBJPEG_DIR)/.libs/libjpeg.a
+$(LIBJPEG): $(LIBJPEG_TO_COPY)
 	cp $(LIBJPEG_DIR)/.libs/libjpeg.a $(LIBJPEG)
 
+$(LIBJPEG_DIR)/libjpeg.a: $(LIBJPEG_DIR)/Makefile $(LIBJPEG_DIR)/*.c $(LIBJPEG_DIR)/*.h
+	@-echo
+	@-echo "making libjpeg support library ..."
+	@-echo
+	cd $(LIBJPEG_DIR) \
+	    && $(MAKE) all CC="$(LIBJPEG_CC)" OPT="$(LIBJPEG_OPT)" CFLAGS="$(LIBJPEG_OPT) $(CCCONFOPT)"
+	@-echo
+
 $(LIBJPEG_DIR)/.libs/libjpeg.a: $(LIBJPEG_DIR)/Makefile $(LIBJPEG_DIR)/*.c $(LIBJPEG_DIR)/*.h
 	@-echo
 	@-echo "making libjpeg support library ..."