This patch fixes up compilation of the uSTL package after migrating almost all uSTL header files into a new include/ustl/ directory. Checked-in.
John Dallaway
Index: ChangeLog =================================================================== RCS file: /cvs/ecos/ecos/packages/language/cxx/ustl/current/ChangeLog,v retrieving revision 1.3 diff -U5 -r1.3 ChangeLog --- ChangeLog 27 Aug 2009 09:00:11 -0000 1.3 +++ ChangeLog 30 Aug 2009 17:14:58 -0000 @@ -1,5 +1,14 @@ +2009-08-30 John Dallaway <[email protected]> + + * include/*.h: Move all headers to include/ustl/ except ustl.h and + stdint.h to avoid pollution of the root include directory in the + eCos install tree. + * include/ustl.h: Specify ustl/ directory when including header files. + * cdl/ustl.h: Add include/ustl/ to the header file directory list + using CYGPKG_USTL_CFLAGS_ADD. + 2009-08-24 Uwe Kindler <[email protected]> * doc/ustl.sgml: Moved documentation from README file into ustl.sgml documentation file. * README: Remove. Index: cdl/ustl.cdl =================================================================== RCS file: /cvs/ecos/ecos/packages/language/cxx/ustl/current/cdl/ustl.cdl,v retrieving revision 1.3 diff -U5 -r1.3 ustl.cdl --- cdl/ustl.cdl 27 Aug 2009 09:00:11 -0000 1.3 +++ cdl/ustl.cdl 30 Aug 2009 17:14:58 -0000 @@ -163,11 +163,11 @@ cdl_option CYGPKG_USTL_CFLAGS_ADD { display "Additional compiler flags" flavor data no_define - default_value { "" } + default_value { "-I$(PREFIX)/include/ustl" } description " This option modifies the set of compiler flags for building the uSTL library. These flags are used in addition to the set of global flags." } Index: include/ustl.h =================================================================== RCS file: /cvs/ecos/ecos/packages/language/cxx/ustl/current/include/ustl.h,v retrieving revision 1.1 diff -U5 -r1.1 ustl.h --- include/ustl.h 20 Aug 2009 17:00:31 -0000 1.1 +++ include/ustl.h 30 Aug 2009 17:14:59 -0000 @@ -4,23 +4,23 @@ // This file is free software, distributed under the MIT License. #ifndef USTL_H_6A5A10410D2CD7FC2D78FE470F045EB7 #define USTL_H_6A5A10410D2CD7FC2D78FE470F045EB7 -#include "uspecial.h" -#include "umap.h" -#include "umultimap.h" -#include "ustack.h" -#include "uqueue.h" +#include "ustl/uspecial.h" +#include "ustl/umap.h" +#include "ustl/umultimap.h" +#include "ustl/ustack.h" +#include "ustl/uqueue.h" #ifdef CYGCLS_USTL_FSTREAMS -#include "ofstream.h" +#include "ustl/ofstream.h" #endif -#include "unumeric.h" -#include "ulist.h" -#include "uheap.h" -#include "ustdxept.h" -#include "ustlecos.h" +#include "ustl/unumeric.h" +#include "ustl/ulist.h" +#include "ustl/uheap.h" +#include "ustl/ustdxept.h" +#include "ustl/ustlecos.h" #endif /// \mainpage ///
