X-Git-Url: https://www.kengrimes.com/gitweb/?p=henge%2Fwebcc.git;a=blobdiff_plain;f=Makefile;h=ae486cd57ff061350f996b223126a10f521eb7e3;hp=d0e4090a312e6091b432c217172747f0d1e4bccf;hb=3d03d8941abeb2a78f3334098a7bd09285023da8;hpb=d054d410ff52ee3c196810a27d885f7799afb9ce

diff --git a/Makefile b/Makefile
index d0e4090..ae486cd 100644
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,6 @@
 ################################################################################
 # Desc:   Web Cross Compiler
-# Author: Ken Grimes
+# Author: ksg
 # Date:   2016
 ################################################################################
 # This makefile manages a build environment targeting native platforms with gcc
@@ -9,8 +9,6 @@
 # Each .c file is automatically compiled into an environment-dependent object
 # file of compiler-specific format (.o for gcc, .bc for llvm/emcc/em++).  
 ################################################################################
-# The default rule to be built if none specified
-default: all
 # webcc's root
 ROOT_DIR    := .
 # source directory to find compilable language files in
@@ -19,104 +17,32 @@ SRC_DIR     := $(ROOT_DIR)/src
 DRIVER_DIR  := $(SRC_DIR)/bin
 # make configuration directory
 CONF_DIR    := $(ROOT_DIR)/make
-# Source languages handled by this build system.  These languages are capable of
-# being compiled to an intermediary format for binary output by one of the
-# provided compilersfor each language
-LANGS       := c cpp go
-# Source-to-source languages handled by this build system
-SLANGS      := y rl
-# Language-specific compilers and flags passed in from environment
-c_C         := $(strip $(notdir $(CC)))
-c_FLAGS     := $(strip $(CFLAGS)) -I$(SRC_DIR)
-c_LIBS      := SDL2 wolfssl
-c_SRCL      := y
-cpp_C       := $(strip $(notdir $(CXX)))
-cpp_FLAGS   := $(strip $(CXXFLAGS)) $(c_FLAGS)
-cpp_LIBS    := $(c_LIBS)
-go_C        := gccgo
-go_FLAGS    := $(c_FLAGS)
-# Source to source languages
-# Bison
-y_C         := bison
-y_FLAGS     := -d
-y_STEM      := tab
-y_TRG       := c h
-# Ragel
-rl_C        := ragel
-rl_FLAGS    := -C
-rl_TRG      := c
-# Compiler-specific associations.  Each compiler has a binary object suffix
-# (OBJ), an archiver (AR), and an archiver object suffix (AROBJ).  Each compiler
-# may optionally have defined a linker (LD), and a binary output suffix (OUT).
-cc_OBJ      := o
-cc_LD       := $(LD)
-cc_AR       := $(AR)
-cc_AROBJ    := a
-cc_DBG      := gdb
-$(cpp_C)_LD := $(cc_LD)
-gcc_OBJ     := $(cc_OBJ)
-gcc_LD      := $(cc_LD)
-ngcc_AR     := $(cc_AR)
-gcc_AROBJ   := $(cc_AROBJ)
-gcc_DBG     := $(cc_DBG)
-emcc_OBJ    := bc
-emcc_AR     := emar
-emcc_AROBJ  := $(emcc_OBJ) #emar is just a python script that reparses shit for emcc
-emcc_OUT    := .js
-g++_OBJ     := $(cc_OBJ)
-em++_OBJ    := $(emcc_OBJ)
-em++_AR     := $(emcc_AR)
-em++_AROBJ  := $(emcc_AROBJ)
-em++_OUT    := $(emcc_OUT)
-gccgo_OBJ   := o
-gccgo_LD    := $(cc_LD)
-gccgo_AR    := $(cc_AR)
-gccgo_AROBJ := $(cc_AROBJ)
-# Shell functions to determine what libraries can be linked by the compiler
-cc_LDLIBS   := $(shell ls /usr/lib | grep ".o" | sed -e 's@^.*lib\([_\+a-zA-Z0-9\-]*\)\..*@\1@g')
-gcc_LDLIBS  := $(cc_LDLIBS)
-emcc_LDLIBS := 
-g++_LDLIBS  := $(cc_LDLIBS)
-em++_LDLIBS := 
-go_LDLIBS   := $(cc_LDLIBS)
-# location to build cross-compilation libraries in, not intended to be installed
-# in the host system
-LIB_DIR     := $(ROOT_DIR)/lib$(shell uname -m)/$($(c_C)_OBJ)
-LIBDL_DIR   := $(LIB_DIR)/.cache
-LIBINC_DIR  := $(ROOT_DIR)/include
-# The makefile MUST be capable of generating these directories and all of their
-# contents.  These directories are removed during the 'scrub' rule
-MAKE_DIRS   := $(LIB_DIR) $(LIBDL_DIR)
-# Set up lib inclusions, and scan for built libs
-c_FLAGS     += -I$(LIBINC_DIR)
-c_OBJ       := $($(c_C)_OBJ)
-# Modules are any directories other than 'DRIVER_MODULE' in 'SRC_DIR' and
-# produce a single archive in 'SRC_DIR' containing all of the module's symbols
-MODULES     := $(patsubst $(SRC_DIR)/%/,%,$(filter-out $(DRIVER_DIR)/%,$(shell ls -d $(SRC_DIR)/*/)))
-
+# include initialization variables
+include $(CONF_DIR)/init.mk
 # Include the make libraries
-include make/lib/*.mk
+include $(CONF_DIR)/lib/*.mk
+
+# The default rule to be built if none specified
+default: all
 
 # If available, invoke the premake system
 ifdef PREMAKE_SOURCE_COMPILER
 $(eval $(call PREMAKE_SOURCE_COMPILER,))
 else
-$(info Warning: No premake system found, source-to-source languages (e.g. bison) not functional)
+$(info No premake system found, source-to-source languages (e.g. ragel) not functional)
 endif
 
 # Backup the CVS password and CVSROOT environment vars in case we change them
+# during lib downloading
 $(if $(wildcard ~/.cvspass),\
 $(eval CVSPASS_BAK := $(file <~/.cvspass)))
 $(if $(CVSROOT),\
 $(eval CVSROOT_BAK := $(CVSROOT)))
 
-# The recursive library dependecy traversal constructs a tree ordered by nested
-# dependency depth.  when linking, this order is reversed.  
-# Initialize each language and look for its files
+# Initialize each language, look for its source files, and generate rules
 ifdef LANG_INIT
 $(foreach lang,$(LANGS),\
 $(eval $(call LANG_INIT,$(lang)))\
-$(eval $(lang)_LIBS := $(shell echo $($(lang)_LIBS | $(call AWK_REVERSE_SQUASH))))\
 )
 else
 $(error No LANG_INIT available, no languages can be compiled)
@@ -135,16 +61,13 @@ $(eval $(call SRC_LANG_DRVRULE,$(drvsrc),$(lang)))\
 ))
 
 # Create driver rules for each driver we found, let users call make specifying
-# the basename of the driver file, and just route to the correct linkrule we
-# made in the last paragraph
-DRV_FNAMES := $(notdir $(DRV_SRC))
-.PHONY: all $(basename $(DRV_NAMES))
-$(foreach fname,$(DRV_FNAMES),\
-$(eval $(basename $(fname)): \
-$(filter %/$(basename $(fname))$($(lastword $(subst ., ,$(fname))_OUT)),$(DRV_TRG)))\
+# the basename of the driver file, and just route to the correct linking rule
+$(foreach drvsrc,$(DRV_SRC),\
+$(eval $(call DRVSRC_DRIVERPHONY,$(drvsrc)))\
 )
-all: $(basename $(DRV_FNAMES))
-	@echo Build Complete
+
+.PHONY: all
+all: $(PH_TARGS)
 
 # Rule to make any dirs that we're in charge of
 $(sort $(MAKE_DIRS)):
@@ -164,7 +87,7 @@ scrub: clean
 # Purge destroys all distributables created by a distributable binary
 # (e.g. assets)
 
-# Uninstall destroys all objects and directories that cannot be recreated by
-# this make file
+# Uninstall destroys all objects and directories that can be recreated by this
+# make file
 uninstall: scrub
 	rm -Rf $(MAKE_DIRS)