Browse Source

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

tags/non-daw-v1.2.0
Jonathan Moore Liles 12 years ago
parent
commit
12ed651e13
4 changed files with 17 additions and 9 deletions
  1. +1
    -2
      FL/configure
  2. +5
    -2
      Makefile
  3. +10
    -4
      README.build
  4. +1
    -1
      lib/ntk

+ 1
- 2
FL/configure View File

@@ -13,8 +13,7 @@ ask "Build for debugging" USE_DEBUG no

begin_tests

require_FLTK 1.1.7 images
require_command FLUID lib/ntk/fluid/fluid
require_NTK 1.3.0 images
require_command ar ar
require_command makedepend makedepend



+ 5
- 2
Makefile View File

@@ -17,11 +17,14 @@
# 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

ntk: lib/.built lib/ntk/configure

lib/ntk/configure:
@ git submodule update --init



+ 10
- 4
README.build View File

@@ -1,7 +1,13 @@

This repository contains all of the non-* software.

To build it, 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.
If you don't have NTK packages installed (which isn't very likely yet)
you *MUST* begin by typing:

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.

+ 1
- 1
lib/ntk

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

Loading…
Cancel
Save