This is the mail archive of the gcc-patches@gcc.gnu.org mailing list for the GCC project.


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]
Other format: [Raw text]

[v3] install header rename patch



Hey Phil, this is a fix for the install bits. I tested it with 'make
check-script-install' and it looks good.

I think this could probably be done by dynamically building up a
variable in the 'stamp-std' rule, but I'm not feeling especially
clever at the moment. This works. 

best,
benjamin

Index: include/Makefile.am
===================================================================
RCS file: /cvs/gcc/gcc/libstdc++-v3/include/Makefile.am,v
retrieving revision 1.24
diff -c -p -r1.24 Makefile.am
*** Makefile.am	2002/01/12 01:42:30	1.24
--- Makefile.am	2002/01/13 05:12:28
*************** std_headers = \
*** 214,219 ****
--- 214,250 ----
  	${std_srcdir}/std_utility.h \
  	${std_srcdir}/std_valarray.h \
  	${std_srcdir}/std_vector.h
+ # Renamed at build time. 
+ std_headers_rename = \
+ 	${std_builddir}/algorithm \
+ 	${std_builddir}/bitset \
+ 	${std_builddir}/complex \
+ 	${std_builddir}/deque \
+ 	${std_builddir}/fstream \
+ 	${std_builddir}/functional \
+ 	${std_builddir}/iomanip \
+ 	${std_builddir}/ios \
+ 	${std_builddir}/iosfwd \
+ 	${std_builddir}/iostream \
+ 	${std_builddir}/istream \
+ 	${std_builddir}/iterator \
+ 	${std_builddir}/limits \
+ 	${std_builddir}/list \
+ 	${std_builddir}/locale \
+ 	${std_builddir}/map \
+ 	${std_builddir}/memory \
+ 	${std_builddir}/numeric \
+ 	${std_builddir}/ostream \
+ 	${std_builddir}/queue \
+ 	${std_builddir}/set \
+ 	${std_builddir}/sstream \
+ 	${std_builddir}/stack \
+ 	${std_builddir}/stdexcept \
+ 	${std_builddir}/streambuf \
+ 	${std_builddir}/string \
+ 	${std_builddir}/utility \
+ 	${std_builddir}/valarray \
+ 	${std_builddir}/vector
  
  target_srcdir = ${glibcpp_srcdir}/@OS_INC_SRCDIR@
  target_builddir = ./${target_alias}/bits
*************** install-data-local:
*** 372,378 ****
  	for file in ${c_base_headers}; do \
  	  $(INSTALL_DATA) $${file} ${gxx_include_dir}/${c_base_builddir}; done
  	$(INSTALL) -d ${gxx_include_dir}/${std_builddir}
! 	for file in ${std_headers}; do \
  	  $(INSTALL_DATA) $${file} ${gxx_include_dir}/${std_builddir}; done
  	$(INSTALL) -d ${gxx_include_dir}/${target_builddir}
  	for file in ${target_headers} ${extra_target_headers}; do \
--- 403,409 ----
  	for file in ${c_base_headers}; do \
  	  $(INSTALL_DATA) $${file} ${gxx_include_dir}/${c_base_builddir}; done
  	$(INSTALL) -d ${gxx_include_dir}/${std_builddir}
! 	for file in ${std_headers_rename}; do \
  	  $(INSTALL_DATA) $${file} ${gxx_include_dir}/${std_builddir}; done
  	$(INSTALL) -d ${gxx_include_dir}/${target_builddir}
  	for file in ${target_headers} ${extra_target_headers}; do \


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]