mingw-cvs Mailing List for MinGW - Minimalist GNU for Windows

Update of /cvsroot/mingw/catgets
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv10048

Modified Files:
	ChangeLog Makefile.in aclocal.m4 configure configure.ac 
Log Message:
Support direct building as a cross-hosted development kit.


Index: aclocal.m4
===================================================================
RCS file: /cvsroot/mingw/catgets/aclocal.m4,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** aclocal.m4	18 Jun 2007 22:36:06 -0000	1.2
--- aclocal.m4	31 Dec 2007 17:09:50 -0000	1.3
***************
*** 155,158 ****
--- 155,212 ----
  ])# MINGW_AC_LC_EXTENSIONS
  
+ # CATGETS_AC_CONFIG_TARGET
+ # ------------------------
+ # Check if building a locally hosted tool chain, targetting a foreign
+ # Win32 runtime host; if this is the case, configure a cross-hosted build
+ # in directory `cross-build', where the target libraries will be built.
+ #
+ AC_DEFUN([CATGETS_AC_CONFIG_TARGET],
+ [AC_SUBST([MAKE_TARGETS], [all-native])
+  if test -n "$target_alias" && test x"$target_alias" != x"$host_alias"
+  then (
+   case $srcdir in
+    .*) ac_command="$SHELL ../$srcdir/$as_me" ;;
+     *) ac_command="$SHELL `cd $srcdir && pwd`/$as_me" ;;
+   esac
+   test -d cross-build || mkdir cross-build; cd cross-build; ac_dir=`pwd`
+   AC_MSG_NOTICE([entering directory `$ac_dir'])
+   AC_MSG_NOTICE([configuring component build for target `$target_alias'])
+   if test -z "$build_alias"
+   then
+    build_alias=`uname -m 2>/dev/null || echo unknown`
+    build_alias=$build_alias-`uname -s 2>/dev/null || echo unknown`
+    build_alias=`echo "$build_alias" | tr $as_cr_LETTERS $as_cr_letters`
+   fi
+   eval $ac_command `eval set x $ac_configure_args; shift
+    ac_opt="" ac_dashdash=""
+    for ac_arg
+    do
+     ac_optarg_needed=no
+     case $ac_dashdash$ac_opt$ac_arg in
+      --) ac_dashdash=yes
+       ;;
+      -build | --build | --buil | --bui | --bu |\
+      -target | --target | --targe | --targ | --tar | --ta | --t |\
+      -host | --host | --hos | --ho )
+       ac_optarg_needed=yes
+       ;;
+      build_alias=* | host_alias=* | target_alias=* |\
+      -build=* | --build=* | --buil=* | --bui=* | --bu=* |\
+      -host=* | --host=* | --hos=* | --ho=* )
+       ;;
+      -target=* | --target=* |\
+      --targe=* | --targ=* | --tar=* | --ta=* | --t=* )
+       echo "'--build=$build_alias' '--host=$target_alias'"
+       ;;
+      *) echo "'$ac_arg'"
+       ;;
+     esac
+     test $ac_optarg_needed = yes && ac_opt="$ac_arg=" || ac_opt=""
+    done`
+   AC_MSG_NOTICE([leaving directory `$ac_dir']) )
+   MAKE_TARGETS=all-cross-hosted
+  fi[]dnl
+ ])# CATGETS_AC_CONFIG_TARGET
+ 
  AC_DEFUN([GENCAT_AC_OBJECTS_INIT],
  [GENCAT_OBJECTS=${GENCAT_OBJECTS-'gencat.$(OBJEXT)'}

Index: Makefile.in
===================================================================
RCS file: /cvsroot/mingw/catgets/Makefile.in,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** Makefile.in	10 Nov 2007 15:12:58 -0000	1.4
--- Makefile.in	31 Dec 2007 17:09:50 -0000	1.5
***************
*** 10,14 ****
  #
  # Written by Keith Marshall  <kei...@us...>
! # Last modification: 10-Nov-2007
  #
  #
--- 10,14 ----
  #
  # Written by Keith Marshall  <kei...@us...>
! # Last modification: 13-Nov-2007
  #
  #
***************
*** 120,124 ****
  mansect_transform = $(foreach s,$(MANSECTS),-e s/@MAN$sEXT@/$(MAN$sEXT)/g)
  mansect = -e $(mansect_lookup) $(mansect_transform) -e q -e \} -e d
! manpage = ${mandir}/man$$section/$$pagename.$$section
  
  # Generic rule to create `page.n' from `page.man'...
--- 120,124 ----
  mansect_transform = $(foreach s,$(MANSECTS),-e s/@MAN$sEXT@/$(MAN$sEXT)/g)
  mansect = -e $(mansect_lookup) $(mansect_transform) -e q -e \} -e d
! manpage = ${mandir}/man$$section/$(man_prefix)$$pagename.$$section
  
  # Generic rule to create `page.n' from `page.man'...
***************
*** 157,173 ****
  
  all-dll = @MAKE_DLL@
  
! all: all-libs $(all-dll) all-bin all-doc
  
! all-bin: $(BUILD_PROGS)
  
  all-dll: $(BUILD_DLLS)
- 
  all-libs: $(BUILD_LIBS)
- 
  all-doc: all-man all-info all-htmldoc all-pdf all-ps
- 
  all-man: $(subst .man,.n,$(MANPAGE_SOURCES))
- 
  all-info:
  all-htmldoc:
--- 157,172 ----
  
  all-dll = @MAKE_DLL@
+ all-targets = @MAKE_TARGETS@
  
! all: $(all-targets)
  
! all-native: all-libs $(all-dll) all-bin all-doc
! all-cross-hosted: all-native cross-build
  
+ all-bin: $(BUILD_PROGS)
  all-dll: $(BUILD_DLLS)
  all-libs: $(BUILD_LIBS)
  all-doc: all-man all-info all-htmldoc all-pdf all-ps
  all-man: $(subst .man,.n,$(MANPAGE_SOURCES))
  all-info:
  all-htmldoc:
***************
*** 175,178 ****
--- 174,179 ----
  all-ps:
  
+ all-cross-hosted-libs: all-libs $(all-dll)
+ 
  gencat$(EXEEXT): $(GENCAT_OBJECTS)
  	$(CC) -o $@ $(CFLAGS) $(LDFLAGS) $^ $(LIBICONV) $(LIBS)
***************
*** 189,192 ****
--- 190,196 ----
  $(GENCAT_OBJECTS): $(GENCAT_HEADERS) $(CATGETS_OBJECTS)
  
+ FORCE:
+ cross-build: FORCE; cd $@ && $(MAKE) all-cross-hosted-libs
+ 
  
  ## ============== ##
***************
*** 203,209 ****
  DLL_IMPORT_LIBNAME = lib`echo "$$dll" | sed 's?$(DLLVERSION).dll?.dll.a?'`
  
! install: install-headers install-progs install-libs
  
! install-progs: all
  	$(mkinstalldirs) --require ${exec_prefix} ${bindir} ${libdir}
  	for prog in $(BUILD_PROGS); do \
--- 207,218 ----
  DLL_IMPORT_LIBNAME = lib`echo "$$dll" | sed 's?$(DLLVERSION).dll?.dll.a?'`
  
! install: install-$(all-targets)
  
! install-all-native: install-progs install-headers install-libs
! 
! install-all-cross-hosted: install-progs
! 	cd cross-build; $(MAKE) install-headers install-libs
! 
! install-bin install-progs: all
  	$(mkinstalldirs) --require ${exec_prefix} ${bindir} ${libdir}
  	for prog in $(BUILD_PROGS); do \
***************
*** 296,305 ****
  ## ========== ##
  
! clean:
  	rm -f nlspath.h $(LOCAL_HEADERS) $(REPLACEMENT_HEADERS)
  	rm -f *.$(OBJEXT) *~ gencat$(EXEEXT) *.n *.a *.dll
  
! distclean: clean
  	rm -rf Makefile config.h config.[ls]* autom4te.cache
  
  # $RCSfile$Revision$: end of file
--- 305,318 ----
  ## ========== ##
  
! clean: FORCE
! 	if test -d cross-build; then cd cross-build; $(MAKE) $@; fi
  	rm -f nlspath.h $(LOCAL_HEADERS) $(REPLACEMENT_HEADERS)
  	rm -f *.$(OBJEXT) *~ gencat$(EXEEXT) *.n *.a *.dll
  
! distclean: distclean-cross-hosted clean
  	rm -rf Makefile config.h config.[ls]* autom4te.cache
  
+ distclean-cross-hosted: FORCE
+ 	rm -rf cross-build
+ 
  # $RCSfile$Revision$: end of file

Index: configure.ac
===================================================================
RCS file: /cvsroot/mingw/catgets/configure.ac,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** configure.ac	11 Nov 2007 17:31:32 -0000	1.3
--- configure.ac	31 Dec 2007 17:09:50 -0000	1.4
***************
*** 49,52 ****
--- 49,56 ----
    AC_INIT(__MINGW_AC_PACKAGE_IDENTIFICATION__)
  
+ # Initialise for possible building as a cross-hosted tool kit.
+ #
+   CATGETS_AC_CONFIG_TARGET
+ 
  # Set up to use `config.h', with included package version tags.
  #

Index: configure
===================================================================
RCS file: /cvsroot/mingw/catgets/configure,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** configure	11 Nov 2007 17:31:32 -0000	1.3
--- configure	31 Dec 2007 17:09:50 -0000	1.4
***************
*** 311,315 ****
  #endif"
  
! ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT LN_S AR ac_ct_AR INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA MAKE_DLL DLLVERSION canonical_prefix HOST_PATH_SEPARATOR REPLACEMENT_HEADERS CPP EGREP LOCAL_HEADERS GENCAT_OBJECTS INCICONV LIBICONV LIBOBJS LTLIBOBJS'
  ac_subst_files=''
  
--- 311,315 ----
  #endif"
  
! ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS MAKE_TARGETS CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT LN_S AR ac_ct_AR INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA MAKE_DLL DLLVERSION canonical_prefix HOST_PATH_SEPARATOR REPLACEMENT_HEADERS CPP EGREP LOCAL_HEADERS GENCAT_OBJECTS INCICONV LIBICONV LIBOBJS LTLIBOBJS'
  ac_subst_files=''
  
***************
*** 1310,1313 ****
--- 1310,1365 ----
  
  
+ # Initialise for possible building as a cross-hosted tool kit.
+ #
+   MAKE_TARGETS=all-native
+ 
+  if test -n "$target_alias" && test x"$target_alias" != x"$host_alias"
+  then (
+   case $srcdir in
+    .*) ac_command="$SHELL ../$srcdir/$as_me" ;;
+     *) ac_command="$SHELL `cd $srcdir && pwd`/$as_me" ;;
+   esac
+   test -d cross-build || mkdir cross-build; cd cross-build; ac_dir=`pwd`
+   { echo "$as_me:$LINENO: entering directory \`$ac_dir'" >&5
+ echo "$as_me: entering directory \`$ac_dir'" >&6;}
+   { echo "$as_me:$LINENO: configuring component build for target \`$target_alias'" >&5
+ echo "$as_me: configuring component build for target \`$target_alias'" >&6;}
+   if test -z "$build_alias"
+   then
+    build_alias=`uname -m 2>/dev/null || echo unknown`
+    build_alias=$build_alias-`uname -s 2>/dev/null || echo unknown`
+    build_alias=`echo "$build_alias" | tr $as_cr_LETTERS $as_cr_letters`
+   fi
+   eval $ac_command `eval set x $ac_configure_args; shift
+    ac_opt="" ac_dashdash=""
+    for ac_arg
+    do
+     ac_optarg_needed=no
+     case $ac_dashdash$ac_opt$ac_arg in
+      --) ac_dashdash=yes
+       ;;
+      -build | --build | --buil | --bui | --bu |\
+      -target | --target | --targe | --targ | --tar | --ta | --t |\
+      -host | --host | --hos | --ho )
+       ac_optarg_needed=yes
+       ;;
+      build_alias=* | host_alias=* | target_alias=* |\
+      -build=* | --build=* | --buil=* | --bui=* | --bu=* |\
+      -host=* | --host=* | --hos=* | --ho=* )
+       ;;
+      -target=* | --target=* |\
+      --targe=* | --targ=* | --tar=* | --ta=* | --t=* )
+       echo "'--build=$build_alias' '--host=$target_alias'"
+       ;;
+      *) echo "'$ac_arg'"
+       ;;
+     esac
+     test $ac_optarg_needed = yes && ac_opt="$ac_arg=" || ac_opt=""
+    done`
+   { echo "$as_me:$LINENO: leaving directory \`$ac_dir'" >&5
+ echo "$as_me: leaving directory \`$ac_dir'" >&6;} )
+   MAKE_TARGETS=all-cross-hosted
+  fi
+ 
  # Set up to use `config.h', with included package version tags.
  #
***************
*** 5629,5632 ****
--- 5681,5685 ----
  s,@ECHO_T@,$ECHO_T,;t t
  s,@LIBS@,$LIBS,;t t
+ s,@MAKE_TARGETS@,$MAKE_TARGETS,;t t
  s,@CC@,$CC,;t t
  s,@CFLAGS@,$CFLAGS,;t t

Index: ChangeLog
===================================================================
RCS file: /cvsroot/mingw/catgets/ChangeLog,v
retrieving revision 1.22
retrieving revision 1.23
diff -C2 -d -r1.22 -r1.23
*** ChangeLog	11 Nov 2007 17:31:31 -0000	1.22
--- ChangeLog	31 Dec 2007 17:09:49 -0000	1.23
***************
*** 1,2 ****
--- 1,24 ----
+ 2007-12-31  Keith Marshall  <kei...@us...>
+ 
+ 	Support direct building as a cross-hosted development kit.
+ 
+ 	* aclocal.m4 (CATGETS_AC_CONFIG_TARGET): New macro.
+ 	* configure.ac: Use it.
+ 	* configure: Regenerated.
+ 
+ 	* Makefile.in (all-targets): New macro; defined by configure...
+ 	(MAKE_TARGETS): ...by means of this substitution variable...
+ 	(all-native, all-cross-hosted): ...these new macros; define them.
+ 	(all): Use it; also require...
+ 	(all-cross-hosted-libs): ...this new target, built recursively...
+ 	(cross-build): ...via this new target.
+ 	(clean, distclean): Clean it...
+ 	(distclean-cross-hosted): ...supported by this new target.
+ 	(FORCE): New pseudo-target, to FORCE it.
+ 	(manpage): Add `man_prefix' placeholder macro.
+ 	(install-all-native, install-all-cross-hosted): New targets.
+ 	(install): Use them.
+ 	(install-bin): New target.
+ 
  2007-11-11  Keith Marshall  <kei...@us...>
  

Update of /cvsroot/mingw/htdocs
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv13652

Modified Files:
	ChangeLog news.shtml 
Log Message:
https://sourceforge.net/tracker/?func=detail&atid=102435&aid=1835015&group_id=2435

Index: news.shtml
===================================================================
RCS file: /cvsroot/mingw/htdocs/news.shtml,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** news.shtml	2 May 2004 19:03:04 -0000	1.9
--- news.shtml	1 Dec 2007 16:44:24 -0000	1.10
***************
*** 17,21 ****
  
  
! <div id="Content">
  <h1>MinGW - News</h1>
  <p>
--- 17,21 ----
  
  
! <div id="mainContent">
  <h1>MinGW - News</h1>
  <p>

Index: ChangeLog
===================================================================
RCS file: /cvsroot/mingw/htdocs/ChangeLog,v
retrieving revision 1.161
retrieving revision 1.162
diff -C2 -d -r1.161 -r1.162
*** ChangeLog	29 Oct 2007 00:00:37 -0000	1.161
--- ChangeLog	1 Dec 2007 16:44:24 -0000	1.162
***************
*** 1,2 ****
--- 1,7 ----
+ 2007-12-01  Earnie Boyd <ea...@us...>
+ 
+ 	* news.shtml: Correct div id from Content to mainContent.
+ 	Thanks to lode_leroy, atid=102435&aid=1835015&group_id=2435.
+ 
  2007-10-28  Keith Marshall  <kei...@us...>