Skip to content

Commit

Permalink
Stop relying on uname and instead ask autoconf what platform
Browse files Browse the repository at this point in the history
we are building for. This makes cross compiling things a lot
easier.


git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@9990 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
  • Loading branch information
CendioOssman committed Sep 24, 2013
1 parent 1029deb commit e1df29b
Show file tree
Hide file tree
Showing 8 changed files with 3,503 additions and 156 deletions.
9 changes: 7 additions & 2 deletions Makefile
Expand Up @@ -66,7 +66,7 @@ clean:
done

distclean: clean
$(RM) config.*
$(RM) config.h config.log config.status
$(RM) fltk-config fltk.list makeinclude
$(RM) fltk.spec
$(RM) FL/Makefile
Expand All @@ -90,7 +90,7 @@ fltk-config: configure configh.in fltk-config.in
touch config.h
chmod +x fltk-config

makeinclude: configure configh.in makeinclude.in
makeinclude: configure configh.in makeinclude.in config.guess config.sub
if test -f config.status; then \
./config.status --recheck; \
./config.status; \
Expand All @@ -103,6 +103,11 @@ makeinclude: configure configh.in makeinclude.in
configure: configure.in
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

Expand Down
7 changes: 5 additions & 2 deletions README.MSWindows.txt
Expand Up @@ -214,9 +214,12 @@ in my dev directory:
Configuring FLTK
------------------

Stay in your FLTK source-code directory. Type:

If you got FLTK via subversion then you need two extra steps. Otherwise skip
over this part. Stay in your FLTK source-code directory. Type the following
but ignore any errors from the second command:

autoconf
automake --add-missing

Now configure your FLTK installation:

Expand Down
5 changes: 4 additions & 1 deletion README.OSX.txt
Expand Up @@ -91,9 +91,12 @@ dev directory:
2.3 Configuring FLTK
-----------------------

Stay in your FLTK source-code directory. Type:
If you got FLTK via subversion then you need two extra steps. Otherwise skip
over this part. Stay in your FLTK source-code directory. Type the following
but ignore any errors from the second command:

autoconf
automake --add-missing

Now configure your FLTK installation:

Expand Down
5 changes: 4 additions & 1 deletion README.Unix.txt
Expand Up @@ -293,9 +293,12 @@ dev directory:
3.2 Configuring FLTK
-----------------------

Stay in your FLTK source-code directory. Type:
If you got FLTK via subversion then you need two extra steps. Otherwise skip
over this part. Stay in your FLTK source-code directory. Type the following
but ignore any errors from the second command:

autoconf
automake --add-missing

Now configure your FLTK installation:

Expand Down

0 comments on commit e1df29b

Please sign in to comment.