Menu
▾
▴
[foo-cvs] fooelk .gitignore, NONE, 1.1 COPYING, 1.1.1.1, 1.2 Makefile.am, 1.3, 1.4 bootstrap, 1.5, 1.6 build-win32, 1.2, 1.3 configure.ac, 1.14, 1.15
|
From: Martin R. <ru...@us...> - 2010-04-26 15:41:17
|
Update of /cvsroot/foo/fooelk In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv9331 Modified Files: COPYING Makefile.am bootstrap build-win32 configure.ac Added Files: .gitignore Log Message: equiv to revision level r274 of original elk: Clean up build system and update copyright information Index: bootstrap =================================================================== RCS file: /cvsroot/foo/fooelk/bootstrap,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** bootstrap 26 Apr 2010 14:48:05 -0000 1.5 --- bootstrap 26 Apr 2010 15:41:07 -0000 1.6 *************** *** 3,16 **** ## $Id$ ! # bootstrap: the ultimate bootstrap/autogen.sh script for autotools projects ! # Copyright (c) 2002, 2003, 2004, 2005, 2006 Sam Hocevar <sa...@zo...> # ! # This program is free software; you can redistribute it and/or ! # modify it under the terms of the Do What The Fuck You Want To ! # Public License, Version 2, as published by Sam Hocevar. See # http://sam.zoy.org/wtfpl/COPYING for more details. # # The latest version of this script can be found at the following place: ! # http://sam.zoy.org/autotools/ # Die if an error occurs --- 3,18 ---- ## $Id$ ! # bootstrap: generic bootstrap/autogen.sh script for autotools projects # ! # Copyright (c) 2002-2009 Sam Hocevar <sa...@ho...> ! # ! # This program is free software. It comes without any warranty, to ! # the extent permitted by applicable law. You can redistribute it ! # and/or modify it under the terms of the Do What The Fuck You Want ! # To Public License, Version 2, as published by Sam Hocevar. See # http://sam.zoy.org/wtfpl/COPYING for more details. # # The latest version of this script can be found at the following place: ! # http://caca.zoy.org/wiki/build # Die if an error occurs *************** *** 28,40 **** # Check for needed features ! auxdir="`sed -ne 's/^[ \t]*A._CONFIG_AUX_DIR *( *\([^ )]*\).*/\1/p' $conffile`" ! libtool="`grep -q '^[ \t]*A._PROG_LIBTOOL' $conffile && echo yes || echo no`" ! header="`grep -q '^[ \t]*A._CONFIG_HEADER' $conffile && echo yes || echo no`" # Check for automake amvers="no" ! for v in "-1.9" "19" "-1.8" "18" "-1.7" "17" "-1.6" "16" "-1.5" "15"; do ! if automake${v} --version >/dev/null 2>&1; then ! amvers="${v}" break fi --- 30,48 ---- # Check for needed features ! auxdir="`sed -ne 's/^[ \t]*A._CONFIG_AUX_DIR *([[ ]*\([^] )]*\).*/\1/p' $conffile`" ! pkgconfig="`grep '^[ \t]*PKG_PROG_PKG_CONFIG' $conffile >/dev/null 2>&1 && echo yes || echo no`" ! libtool="`grep '^[ \t]*A._PROG_LIBTOOL' $conffile >/dev/null 2>&1 && echo yes || echo no`" ! header="`grep '^[ \t]*A._CONFIG_HEADER' $conffile >/dev/null 2>&1 && echo yes || echo no`" ! makefile="`[ -f Makefile.am ] && echo yes || echo no`" ! aclocalflags="`sed -ne 's/^[ \t]*ACLOCAL_AMFLAGS[ \t]*=//p' Makefile.am 2>/dev/null || :`" # Check for automake amvers="no" ! for v in 11 10 9 8 7 6 5; do ! if automake-1.${v} --version >/dev/null 2>&1; then ! amvers="-1.${v}" ! break ! elif automake1.${v} --version >/dev/null 2>&1; then ! amvers="1.${v}" break fi *************** *** 89,96 **** fi # Remove old cruft for x in aclocal.m4 configure config.guess config.log config.sub config.cache config.h.in config.h compile libtool.m4 ltoptions.m4 ltsugar.m4 ltversion.m4 ltmain.sh libtool ltconfig missing mkinstalldirs depcomp install-sh; do rm -f $x autotools/$x; if test -n "$auxdir"; then rm -f "$auxdir/$x"; fi; done rm -Rf autom4te.cache ! if test -n "$auxdir" -a ! -d "$auxdir"; then mkdir "$auxdir"; fi # Explain what we are doing from now --- 97,117 ---- fi + # Check for pkg-config + if test "$pkgconfig" = "yes"; then + if ! pkg-config --version >/dev/null 2>&1; then + echo "$0: you need pkg-config" + exit 1 + fi + fi + # Remove old cruft for x in aclocal.m4 configure config.guess config.log config.sub config.cache config.h.in config.h compile libtool.m4 ltoptions.m4 ltsugar.m4 ltversion.m4 ltmain.sh libtool ltconfig missing mkinstalldirs depcomp install-sh; do rm -f $x autotools/$x; if test -n "$auxdir"; then rm -f "$auxdir/$x"; fi; done rm -Rf autom4te.cache ! if test -n "$auxdir"; then ! if test ! -d "$auxdir"; then ! mkdir "$auxdir" ! fi ! aclocalflags="${aclocalflags} -I $auxdir -I ." ! fi # Explain what we are doing from now *************** *** 100,104 **** if test "$libtool" = "yes"; then ${libtoolize} --copy --force ! if test -n "$auxdir" -a -f "ltmain.sh"; then echo "$0: working around a minor libtool issue" mv ltmain.sh "$auxdir/" --- 121,125 ---- if test "$libtool" = "yes"; then ${libtoolize} --copy --force ! if test -n "$auxdir" -a ! "$auxdir" = "." -a -f "ltmain.sh"; then echo "$0: working around a minor libtool issue" mv ltmain.sh "$auxdir/" *************** *** 106,121 **** fi ! if test -n "$auxdir"; then ! aclocal${amvers} -I autotools ! else ! aclocal${amvers} ! fi autoconf${acvers} if test "$header" = "yes"; then autoheader${acvers} fi ! #add --include-deps if you want to bootstrap with any other compiler than gcc ! #automake${amvers} --add-missing --copy --include-deps ! automake${amvers} --foreign --add-missing --copy # Remove cruft that we no longer want --- 127,140 ---- fi ! aclocal${amvers} ${aclocalflags} autoconf${acvers} if test "$header" = "yes"; then autoheader${acvers} fi ! if test "$makefile" = "yes"; then ! #add --include-deps if you want to bootstrap with any other compiler than gcc ! #automake${amvers} --add-missing --copy --include-deps ! automake${amvers} --foreign --add-missing --copy ! fi # Remove cruft that we no longer want --- NEW FILE: .gitignore --- # Generic autotools files *.o *.lo *.la *.exe *.pc .auto .libs .deps Makefile Makefile.in aclocal.m4 autom4te.cache config.h.in config.h config.log config.status configure libtool stamp-* *-stamp # Configure-generated files include/site.h scm/slib.scm # Build-generated files src/elk lib/xwidgets/xaw/*.c lib/xwidgets/motif/*.c doc/*/*.inx doc/*/*.ms doc/*/*.ps doc/*/*.raw doc/*/*.ref doc/cprog/side Index: configure.ac =================================================================== RCS file: /cvsroot/foo/fooelk/configure.ac,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -d -r1.14 -r1.15 *** configure.ac 26 Apr 2010 15:33:11 -0000 1.14 --- configure.ac 26 Apr 2010 15:41:07 -0000 1.15 *************** *** 4,12 **** AC_PREREQ(2.50) ! AC_CONFIG_AUX_DIR(autotools) AC_CANONICAL_SYSTEM AM_INIT_AUTOMAKE(fooelk, 0.0.7) ! AM_MAINTAINER_MODE AM_CONFIG_HEADER(config.h) --- 4,12 ---- AC_PREREQ(2.50) ! AC_CONFIG_AUX_DIR(.auto) AC_CANONICAL_SYSTEM AM_INIT_AUTOMAKE(fooelk, 0.0.7) ! dnl AM_MAINTAINER_MODE AM_CONFIG_HEADER(config.h) *************** *** 705,708 **** --- 705,709 ---- scm/Makefile src/Makefile + test/Makefile scm/slib.scm Index: Makefile.am =================================================================== RCS file: /cvsroot/foo/fooelk/Makefile.am,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** Makefile.am 26 Apr 2010 14:57:39 -0000 1.3 --- Makefile.am 26 Apr 2010 15:41:07 -0000 1.4 *************** *** 1,5 **** NULL = ! SUBDIRS = include src lib scm doc examples DIST_SUBDIRS = $(SUBDIRS) --- 1,5 ---- NULL = ! SUBDIRS = include src lib scm doc examples test DIST_SUBDIRS = $(SUBDIRS) Index: COPYING =================================================================== RCS file: /cvsroot/foo/fooelk/COPYING,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** COPYING 6 Aug 2004 20:56:41 -0000 1.1.1.1 --- COPYING 26 Apr 2010 15:41:07 -0000 1.2 *************** *** 3,7 **** Copyright 1990, 1991, 1992, 1993, 1994, 1995, Oliver Laumann, Berlin (except for the contents of the directory `doc/usenix'). ! Copyright 2002, 2003 Sam Hocevar <sa...@zo...>, Paris This software was derived from Elk 1.2, which was Copyright 1987, 1988, --- 3,7 ---- Copyright 1990, 1991, 1992, 1993, 1994, 1995, Oliver Laumann, Berlin (except for the contents of the directory `doc/usenix'). ! Copyright 2002, 2003 Sam Hocevar <sa...@ho...>, Paris This software was derived from Elk 1.2, which was Copyright 1987, 1988, *************** *** 10,16 **** project between TELES and Nixdorf Microprocessor Engineering, Berlin). ! Oliver Laumann, TELES GmbH, and Nixdorf Computer AG, as co-owners or ! individual owners of copyright in this software, grant to any person or ! company a worldwide, royalty free, license to i) copy this software, --- 10,16 ---- project between TELES and Nixdorf Microprocessor Engineering, Berlin). ! Sam Hocevar, Oliver Laumann, TELES GmbH, and Nixdorf Computer AG, as ! co-owners or individual owners of copyright in this software, grant to ! any person or company a worldwide, royalty free, license to i) copy this software, *************** *** 20,27 **** v) display this software, ! provided that this notice is not removed and that neither Oliver Laumann ! nor Teles nor Nixdorf are deemed to have made any representations as to ! the suitability of this software for any purpose nor are held responsible ! for any defects of this software. THERE IS ABSOLUTELY NO WARRANTY FOR THIS SOFTWARE. --- 20,27 ---- v) display this software, ! provided that this notice is not removed and that neither Sam Hocevar, ! Oliver Laumann, nor Teles nor Nixdorf are deemed to have made any ! representations as to the suitability of this software for any purpose ! nor are held responsible for any defects of this software. THERE IS ABSOLUTELY NO WARRANTY FOR THIS SOFTWARE. Index: build-win32 =================================================================== RCS file: /cvsroot/foo/fooelk/build-win32,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** build-win32 26 Apr 2010 15:31:07 -0000 1.2 --- build-win32 26 Apr 2010 15:41:07 -0000 1.3 *************** *** 1,5 **** #! /bin/sh ! ## Win32 cross-compilation for Elk -- Sam Hocevar <sa...@zo...> ## $Id$ --- 1,5 ---- #! /bin/sh ! ## Win32 cross-compilation for Elk -- Sam Hocevar <sa...@ho...> ## $Id$ |
