mirror of https://github.com/fltk/fltk
Fix README files and remove stale config.guess and config.sub
README.Unix.txt and README.Windows.txt (MinGW, MSYS) instructed to execute `NOCONFIGURE=1 ./autogen.sh` which is no longer necessary (a simple `autoconf` does the job). Remove files misc/config.guess and misc/config.sub because they are no longer needed: these files are now in th FLTK root directory available. Remove all references to these files. Fix .gitattributes accordingly. Also exclude the .github folder from exports, for instance when creating distribution tarballs.
This commit is contained in:
Albrecht Schlosser
parent
7e484c614c
commit
ef1c2d5b26
|
|
@ -9,16 +9,16 @@
|
|||
# - do we need to define Git attributes for source and text files?
|
||||
# - if yes, how to migrate "svn:eol-style native" to Git?
|
||||
# - which attributes do we need for fluid (.fl) files?
|
||||
# - what about "svn:keywords id" (+ author date revision)?
|
||||
#
|
||||
|
||||
# files that will not be exported in source tarballs
|
||||
# (note: .git is not exported anyway)
|
||||
|
||||
makesrcdist export-ignore eol=lf
|
||||
.gitattributes export-ignore
|
||||
.github export-ignore
|
||||
.gitignore export-ignore
|
||||
.gitlab-ci.yml export-ignore
|
||||
.travis.yml export-ignore
|
||||
|
||||
# fluid files (eol=lf or text?)
|
||||
|
||||
|
|
@ -34,8 +34,6 @@ makesrcdist export-ignore eol=lf
|
|||
fltk-config.in eol=lf
|
||||
|
||||
documentation/make_pdf eol=lf
|
||||
misc/config.guess eol=lf
|
||||
misc/config.sub eol=lf
|
||||
misc/update_config_scripts eol=lf
|
||||
|
||||
# files with Windows line endings (crlf)
|
||||
|
|
|
|||
7
Makefile
7
Makefile
|
|
@ -91,7 +91,7 @@ fltk-config: configure configh.in fltk-config.in
|
|||
touch config.h
|
||||
chmod +x fltk-config
|
||||
|
||||
makeinclude: configure configh.in makeinclude.in config.guess config.sub
|
||||
makeinclude: configure configh.in makeinclude.in
|
||||
if test -f config.status; then \
|
||||
./config.status --recheck; \
|
||||
./config.status; \
|
||||
|
|
@ -104,11 +104,6 @@ makeinclude: configure configh.in makeinclude.in config.guess config.sub
|
|||
configure: configure.ac
|
||||
autoconf
|
||||
|
||||
config.guess config.sub:
|
||||
-automake --add-missing 2> /dev/null
|
||||
if [ ! -e config.sub ]; then echo NOTE: Using frozen copy of config.sub; cp misc/config.sub . ; fi
|
||||
if [ ! -e config.guess ]; then echo NOTE: Using frozen copy of config.guess; cp misc/config.guess . ; fi
|
||||
|
||||
portable-dist:
|
||||
epm -v -s fltk.xpm fltk
|
||||
|
||||
|
|
|
|||
|
|
@ -298,12 +298,17 @@ If you got FLTK via git then you need one extra step. Otherwise skip
|
|||
over this part. Stay in your FLTK source-code directory and type the
|
||||
following:
|
||||
|
||||
NOCONFIGURE=1 ./autogen.sh
|
||||
autoconf
|
||||
|
||||
Now configure your FLTK installation:
|
||||
|
||||
./configure
|
||||
|
||||
Hint: Instead of executing `autoconf` and `configure` followed by `make`
|
||||
to build FLTK (see next section) you can also run `make` directly which
|
||||
will create and execute the 'configure' script with default parameters
|
||||
and build FLTK with the default configuration.
|
||||
|
||||
ADVANCED: type "./configure --help" to get a complete list of optional
|
||||
configuration parameters. These should be pretty self-explanatory. Some
|
||||
more details can be found in README.
|
||||
|
|
|
|||
|
|
@ -214,12 +214,17 @@ If you got FLTK via git then you need one extra step. Otherwise skip
|
|||
over this part. Stay in your FLTK source-code directory and type the
|
||||
following:
|
||||
|
||||
NOCONFIGURE=1 ./autogen.sh
|
||||
autoconf
|
||||
|
||||
Now configure your FLTK installation:
|
||||
|
||||
./configure
|
||||
|
||||
Hint: Instead of executing `autoconf` and `configure` followed by `make`
|
||||
to build FLTK (see next section) you can also run `make` directly which
|
||||
will create and execute the 'configure' script with default parameters
|
||||
and build FLTK with the default configuration.
|
||||
|
||||
ADVANCED: type "./configure --help" to get a complete list of optional
|
||||
configuration parameters. These should be pretty self-explanatory. Some
|
||||
more details can be found in README.
|
||||
|
|
|
|||
28
autogen.sh
28
autogen.sh
|
|
@ -1,16 +1,20 @@
|
|||
#! /bin/sh
|
||||
|
||||
srcdir=`dirname $0`
|
||||
test -z "$srcdir" && srcdir=.
|
||||
srcdir=`cd $srcdir && pwd`
|
||||
|
||||
ORIGDIR=`pwd`
|
||||
cd $srcdir
|
||||
#
|
||||
# This file is no longer referred to in the documentation, it's kept
|
||||
# for backwards compatibility only.
|
||||
#
|
||||
# Just run `autoconf` instead to generate `configure` and you're done.
|
||||
#
|
||||
# The old README.Unix.txt stated that it should be executed from within
|
||||
# the "FLTK source-code directory", hence changing directories is not
|
||||
# useful and would break if the user's home directory contained spaces.
|
||||
# Changing directories has been removed in FLTK 1.4.0 and this file
|
||||
# has been simplified substantially.
|
||||
#
|
||||
# Instead of executing it as documented in pre-1.4 README files the new docs
|
||||
# instruct to just execute `autoconf` which is sufficient and equivalent to
|
||||
# the old instructions.
|
||||
|
||||
autoconf --force || exit 1
|
||||
automake --add-missing
|
||||
if test ! -e config.sub; then echo NOTE: Using frozen copy of config.sub; cp misc/config.sub . ; fi
|
||||
if test ! -e config.guess; then echo NOTE: Using frozen copy of config.guess; cp misc/config.guess . ; fi
|
||||
cd $ORIGDIR || exit $?
|
||||
|
||||
test -n "$NOCONFIGURE" || $srcdir/configure "$@"
|
||||
test -n "$NOCONFIGURE" || ./configure "$@"
|
||||
|
|
|
|||
|
|
@ -121,9 +121,6 @@ sed -e '1,$s/@VERSION@/'$version'/' \
|
|||
echo Creating configure script...
|
||||
autoconf -f
|
||||
|
||||
echo Creating config.guess and config.sub \(ignore any other errors\)...
|
||||
automake --add-missing --copy 2>/dev/null
|
||||
|
||||
echo Cleaning developer files...
|
||||
rm -rf OpenGL autom4te* bc5 config forms glut images packages themes
|
||||
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
|
|
@ -3,7 +3,7 @@
|
|||
# Update the bundled scripts config.guess and config.sub
|
||||
# for the Fast Light Tool Kit (FLTK).
|
||||
#
|
||||
# Copyright 1998-2017 by Bill Spitzak and others.
|
||||
# Copyright 1998-2021 by Bill Spitzak and others.
|
||||
#
|
||||
# This library is free software. Distribution and use rights are outlined in
|
||||
# the file "COPYING" which should have been included with this file. If this
|
||||
|
|
@ -24,19 +24,18 @@
|
|||
# browser to view and download the files if wget is not installed on
|
||||
# your system.
|
||||
#
|
||||
# After updating the scripts, copy config.guess and config.sub
|
||||
# to the FLTK root directory, test, and eventually commit the changes:
|
||||
# After downloading the scripts, copy config.guess and config.sub to
|
||||
# the FLTK root directory, test, and eventually commit the changes:
|
||||
#
|
||||
# # cd to FLTK root directory
|
||||
#
|
||||
# $ make distclean
|
||||
# $ rm -f config.guess config.sub configure
|
||||
# $ cp misc/config.guess misc/config.sub .
|
||||
# $ autoconf -f
|
||||
# $ ./configure [options ...]
|
||||
# $ make
|
||||
# # test
|
||||
# $ svn commit
|
||||
# $ git add config.guess config.sub
|
||||
# $ git commit
|
||||
#
|
||||
|
||||
for FILE in config.guess config.sub; do
|
||||
|
|
|
|||
Loading…
Reference in New Issue