# HG changeset patch # User Claus Gittinger # Date 1369648883 -7200 # Node ID 2750586ad252e2e2bcfc122fb23d274d2d571999 # Parent 12f911ad59dc12cfcefa10c4b86f3525b72a815a automatically generated by browser diff -r 12f911ad59dc -r 2750586ad252 Make.proto --- a/Make.proto Mon May 27 12:01:00 2013 +0200 +++ b/Make.proto Mon May 27 12:01:23 2013 +0200 @@ -1,4 +1,4 @@ -# $Header: /cvs/stx/stx/libview2/Make.proto,v 1.148 2013-05-07 19:54:26 cg Exp $ +# $Header: /cvs/stx/stx/libview2/Make.proto,v 1.149 2013-05-27 10:01:23 cg Exp $ # # DO NOT EDIT # automagically generated from the projectDefinition: stx_libview2. @@ -34,7 +34,7 @@ # add the path(es) here:, # ********** OPTIONAL: MODIFY the next lines *** # LOCALINCLUDES=-Ifoo -Ibar -LOCALINCLUDES= -I$(INCLUDE_TOP)/stx/libbasic -I$(INCLUDE_TOP)/stx/libbasic2 -I$(INCLUDE_TOP)/stx/libview +LOCALINCLUDES=$(JPEG_INCLUDE) -I$(INCLUDE_TOP)/stx/libview -I$(INCLUDE_TOP)/stx/libbasic # if you need any additional defines for embedded C code, @@ -94,9 +94,12 @@ echo; \ fi +$(LIBJPEG_DIR)/libjpeg.a: $(LIBJPEG_MAKE_LIB) + cp $(LIBJPEG_MAKE_LIB)/.libs/libjpeg.a $(LIBJPEG) + #the following is needed for linux; LIBJPEG_MAKE_LIB is expanded to: $(LIBJPEG_DIR)/.libs/libjpeg.a -#do not replace taget below by LIBJPEG_MAKE_LIB, because it may be empty for other systems (osx) -$(LIBJPEG): $(LIBJPEG_DIR)/Makefile $(LIBJPEG_DIR)/*.c $(LIBJPEG_DIR)/*.h +#do not replace target below by LIBJPEG_MAKE_LIB, because it may be empty for other systems (osx) +$(LIBJPEG_DIR)/.libs/libjpeg.a: $(LIBJPEG_DIR)/Makefile $(LIBJPEG_DIR)/*.c $(LIBJPEG_DIR)/*.h @-echo @-echo "making libjpeg support library ..." @-echo