Buildsys2

diff --git a/src/.make/buildc.mk b/src/.make/buildc.mk
index 48e9d0a..310929e 100644 (file)
--- a/src/.make/buildc.mk
+++ b/src/.make/buildc.mk
@@ -70,6 +70,19 @@ LDSED  ?= sed -e 's@^.*cannot find -l\([a-zA-Z0-9\.]*\).*@\1@g'
 #Calculate missing libs
 MISSINGLIBS ?= $(strip $(shell $(LDPIPE) | $(LDGREP) | $(LDSED)))
 
+#Missing libraries will be downloaded
+#to MLSRCDIR and installed at MLLIBDIR
+MLDIR    := /usr/local
+MLSRCDIR := $(MLDIR)/src
+#If we aren't compiling for our own environment,
+#we need to create a directory for that type of
+#transpiled library
+ARCHLOCAL := $(shell uname -m | grep "$(CARCH)")
+MLLIBDIR  := $(if $(ARCHLOCAL),$(MLDIR)/lib,$(MLDIR)/lib$(CARCH))
+
+CFLAGS += -L$(MLLIBDIR)
+CFLAGS += $(patsubst %,-I$(MLSRCDIR)/%,$(CLIBS))
+
 #Include handler for building missing libs, if any
 ifdef MISSINGLIBS
 include .make/buildclibs.mk

diff --git a/src/.make/buildclibs.mk b/src/.make/buildclibs.mk
index ccd85ce..f21b2b8 100644 (file)
--- a/src/.make/buildclibs.mk
+++ b/src/.make/buildclibs.mk
@@ -8,16 +8,6 @@
 #compiling, and linking GNU-like C libraries
 ##################################################
 
-#Missing libraries will be downloaded
-#to MLSRCDIR and installed at MLLIBDIR
-MLDIR    := /usr/local
-MLSRCDIR := $(MLDIR)/src
-#If we aren't compiling for our own environment,
-#we need to create a directory for that type of
-#transpiled library
-ARCHLOCAL := $(shell uname -m | grep "$(CARCH)")
-MLLIBDIR  := $(if $(ARCHLOCAL),$(MLDIR)/lib,$(MLDIR)/lib$(CARCH))
-
 #Modify the dependency generator to find the right directory for
 #missing lib includes (they are in MLDIR/src/libname/libname)
 CDEPSCOMMAND += $(patsubst %, | sed -e 's@ \(%\)/@$(MLSRCDIR)/\1/\1/@',$(MISSINGLIBS))
@@ -27,9 +17,6 @@ AMGEN  ?= ./autogen.sh
 AMCONF ?= ./configure
 AMMAKE ?= make
 
-#Import the headers for each missing library (XTDIR/LIBNAME)
-CFLAGS += -L$(MLLIBDIR) $(patsubst %,-I$(MLSRCDIR)/%,$(MISSINGLIBS))
-
 #Notify user of libraries that are about to be built
 $(info Libraries to be built in $(MLLIBDIR):)
 $(info $(patsubst %,lib%.so,$(MISSINGLIBS)))