| @@ -17,8 +17,15 @@ | |||||
| # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. # | # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. # | ||||
| ############################################################################### | ############################################################################### | ||||
| include scripts/colors | |||||
| SUBDIRS=nonlib FL timeline mixer session-manager sequencer | SUBDIRS=nonlib FL timeline mixer session-manager sequencer | ||||
| .config: configure | |||||
| @ echo $(BOLD)$(YELLOW)Hey! You need to run 'configure' first. | |||||
| @ echo If that fails because of NTK stuff, then you need to run 'make ntk' first.$(SGR0) | |||||
| @ exit 1 | |||||
| all: .config | all: .config | ||||
| @ echo '!!! If you have any trouble here try reading README.build !!!' | @ 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 | ||||
| @@ -31,12 +38,6 @@ lib/ntk/configure: | |||||
| lib/.built: | lib/.built: | ||||
| @ make -C lib | @ make -C lib | ||||
| .config: configure | |||||
| ./configure | |||||
| config: configure | |||||
| ./configure | |||||
| clean: | clean: | ||||
| @ for dir in $(SUBDIRS); do $(MAKE) -s -C $$dir clean; done | @ for dir in $(SUBDIRS); do $(MAKE) -s -C $$dir clean; done | ||||
| @@ -6,8 +6,7 @@ you *MUST* begin by typing: | |||||
| make ntk | 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. | |||||
| Then, run './configure' (use the '-i' option if you want to interactively | |||||
| configure) Then, to build everything else, just type 'make'. Stuff will happen. | |||||
| Don't make things harder on yourself by trying to build everything individually. Just | |||||
| type 'make'. I'm serious. It's that simple. | |||||
| @@ -23,16 +23,15 @@ | |||||
| ## Do not edit this file; run `make config` instead. | ## Do not edit this file; run `make config` instead. | ||||
| ## | ## | ||||
| all: .config | |||||
| include scripts/colors | |||||
| .config: configure | .config: configure | ||||
| @ echo '<<< Configuring '$(PACKAGE) | |||||
| @ ./configure | |||||
| config: | |||||
| @ echo '<<< Configuring '$(PACKAGE) | |||||
| @ ./configure | |||||
| @ echo $(BOLD)$(YELLOW)Hey! You need to run 'configure' first.$(SGR0) | |||||
| @ exit 1 | |||||
| #config: | |||||
| # @ echo '<<< Configuring '$(PACKAGE) | |||||
| # @ ./configure | |||||
| -include .config | -include .config | ||||
| @@ -76,9 +75,6 @@ CFLAGS+=-DVERSION=\"$(VERSION)\" \ | |||||
| CXXFLAGS := $(CFLAGS) $(CXXFLAGS) | CXXFLAGS := $(CFLAGS) $(CXXFLAGS) | ||||
| include scripts/colors | |||||
| SPACE:=" `tput cuf 20`" | SPACE:=" `tput cuf 20`" | ||||
| ifneq ($(CALCULATING),yes) | ifneq ($(CALCULATING),yes) | ||||
| @@ -126,3 +122,6 @@ scan-gpl: | |||||
| @ scripts/scan-gpl $(SRCS) || echo $(BOLD)$(RED)Some source files do not contain proper license information! | @ scripts/scan-gpl $(SRCS) || echo $(BOLD)$(RED)Some source files do not contain proper license information! | ||||
| -include .deps | -include .deps | ||||
| all: .config | |||||
| @@ -246,7 +246,7 @@ append () | |||||
| end () | end () | ||||
| { | { | ||||
| info "Configuration complete" | |||||
| info "Configuration complete. You may now run 'make'" | |||||
| touch .config | touch .config | ||||
| } | } | ||||