mirrors
/
non
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

scripts: More changes to support using system installed NTK. Don't automatically assume user wants to checkout/build NTK submodule.

This commit is contained in:
Jonathan Moore Liles 2012-10-30 11:52:36 -07:00
parent 21ba2e35e5
commit 12ed651e13
4 changed files with 17 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
FL/configure vendored
View File

@ -13,8 +13,7 @@ ask "Build for debugging" USE_DEBUG no
begin_tests begin_tests
require_FLTK 1.1.7 images require_NTK 1.3.0 images
require_command FLUID lib/ntk/fluid/fluid
require_command ar ar require_command ar ar
require_command makedepend makedepend require_command makedepend makedepend

7
Makefile
View File

@ -17,11 +17,14 @@
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. # # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #
############################################################################### ###############################################################################
SUBDIRS=lib nonlib FL timeline mixer session-manager sequencer SUBDIRS=nonlib FL timeline mixer session-manager sequencer
all: lib/ntk/configure lib/.built .config all: .config
@ echo '!!! If you have any trouble here try reading README.build !!!'
@ for dir in $(SUBDIRS); do echo Building $$dir; $(MAKE) -s -C $$dir; done @ for dir in $(SUBDIRS); do echo Building $$dir; $(MAKE) -s -C $$dir; done
ntk: lib/.built lib/ntk/configure
lib/ntk/configure: lib/ntk/configure:
@ git submodule update --init @ git submodule update --init

14
README.build
View File

@ -1,7 +1,13 @@
This repository contains all of the non-* software. This repository contains all of the non-* software.
To build it, just type 'make'. Stuff will happen. Eventually, you'll If you don't have NTK packages installed (which isn't very likely yet)
have to answer some build questions. Just answer them. Don't make you *MUST* begin by typing:
things harder on yourself by trying to build everything
individually. Just type 'make'. I'm serious. It's that simple. make ntk
Then, to build everything else, just type 'make'. Stuff will
happen. Eventually, you'll have to answer some build questions. Just
answer them. Don't make things harder on yourself by trying to build
everything individually. Just type 'make'. I'm serious. It's that
simple.

2
lib/ntk

@ -1 +1 @@
Subproject commit 2d774d43691316d27abb753bc7eb4859856690aa Subproject commit f24b36393548f176a197a8a4aa05a79620b77ada