diff --git a/FL/configure b/FL/configure index 7212859..d4e292b 100755 --- a/FL/configure +++ b/FL/configure @@ -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 diff --git a/Makefile b/Makefile index 2ac5338..d253caf 100644 --- a/Makefile +++ b/Makefile @@ -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 diff --git a/README.build b/README.build index 96a246f..1eee8f2 100644 --- a/README.build +++ b/README.build @@ -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. \ No newline at end of file +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. \ No newline at end of file diff --git a/lib/ntk b/lib/ntk index 2d774d4..f24b363 160000 --- a/lib/ntk +++ b/lib/ntk @@ -1 +1 @@ -Subproject commit 2d774d43691316d27abb753bc7eb4859856690aa +Subproject commit f24b36393548f176a197a8a4aa05a79620b77ada