# HG changeset patch # User Michael Beyl # Date 1369727923 -7200 # Node ID 3c2495bd59e325bfca6a3a4a851b0dadf82bb2c5 # Parent 70cc0b32bce9af4ff85e31a48c0d7417e153afc2 automatically generated by browser diff -r 70cc0b32bce9 -r 3c2495bd59e3 Make.proto --- a/Make.proto Mon May 27 12:01:33 2013 +0200 +++ b/Make.proto Tue May 28 09:58:43 2013 +0200 @@ -1,4 +1,4 @@ -# $Header: /cvs/stx/stx/libview2/Make.proto,v 1.149 2013-05-27 10:01:23 cg Exp $ +# $Header: /cvs/stx/stx/libview2/Make.proto,v 1.150 2013-05-28 07:58:43 mb 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=$(JPEG_INCLUDE) -I$(INCLUDE_TOP)/stx/libview -I$(INCLUDE_TOP)/stx/libbasic +LOCALINCLUDES= -I$(INCLUDE_TOP)/stx/libbasic -I$(INCLUDE_TOP)/stx/libbasic2 -I$(INCLUDE_TOP)/stx/libview # if you need any additional defines for embedded C code, @@ -98,7 +98,7 @@ 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 target below by LIBJPEG_MAKE_LIB, because it may be empty for other systems (osx) +#do not replace taget 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 ..." @@ -132,6 +132,7 @@ # build all mandatory prerequisite packages (containing superclasses) for this package prereq: cd ../libbasic && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)" + cd ../libbasic2 && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)" cd ../libview && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"