Buildsys2

[henge/webcc.git] / src / .make / build.mk

diff --git a/src/.make/build.mk b/src/.make/build.mk
index 86e518d..12affc7 100644 (file)
--- a/src/.make/build.mk
+++ b/src/.make/build.mk
@@ -11,25 +11,20 @@
 ##################################################
 #Environment Setup
 ##################################################
-#Extra modules to build (core is built by default)
-MODULES  :=
-#Libraries to include
-LIBS     := wolfssl SDL2 SDL2_image SDL2_ttf
-
-#Build system directory management
-REPOROOT := ..
-DISTDIR  := $(REPOROOT)/dist
-BINDIR   := $(DISTDIR)/bin
-EXEDIR   := $(BINDIR)/$(shell uname -m)
-XTDIR    := $(REPOROOT)/extern
-XTLIBDIR := /usr/local/lib/mihrtec
+#Project root
+PROJDIR  := ..
+#Output directories for distributables
+DISTDIR  := $(PROJDIR)/dist
 
 #Build rules for each source type
 include .make/buildc.mk
+include .make/buildhtml.mk
 
 #Set the final target, flags, and objects for app compile
-APPDEPS  := $(CTARG) $(APPDEPS)
-APPTARG  := $(EXEDIR)/$(APPNAME)$(APPSUFFIX)
-APPFLAGS := $(CXXFLAGS) $(CFLAGS) $(APPFLAGS)
-APPDIRS  := $(sort $(dir $(APPTARG) $(WEBTARG)))
+APPC     := $(CC)
+APPDEPS  := $(strip $(CDEPS) $(CTARG) $(APPDEPS))
+APPSRC   := $(filter %$(COBJSUF),$(APPDEPS))
+APPTARG  := $(CBINDIR)/$(APPNAME)$(APPSUF)
+APPFLAGS := $(strip $(CXXFLAGS) $(CFLAGS) $(APPFLAGS))
+APPDIRS  := $(sort $(dir $(APPTARG) $(APPDEPS)))