From 199d4042d5e82d478c048f11bc78e8ab29e59ccb Mon Sep 17 00:00:00 2001
From: Joseph McLaughlin <jmclaug2@uoregon.edu>
Date: Tue, 27 Aug 2024 11:14:15 -0700
Subject: [PATCH] Fix Makefile so both actually ccompile now

---
 Makefile | 73 +++++++++++++++++++++++++++++++-------------------------
 1 file changed, 40 insertions(+), 33 deletions(-)

diff --git a/Makefile b/Makefile
index 505dda4..7b29533 100644
--- a/Makefile
+++ b/Makefile
@@ -17,12 +17,16 @@ space := $(nil) $(nil)
 source_ext = c
 header_directory = include
 source_directory = source
-object_directory = object
+build_directory  = build
+native_directory = $(build_directory)/native
+wasm_directory   = $(build_directory)/wasm
+native_object_directory = $(native_directory)/object
+wasm_object_directory = $(wasm_directory)/object
 binary_directory = .
 bison_source = $(source_directory)/bison.c
 bison_header = $(header_directory)/bison.h
-bison_object = $(object_directory)/bison.o
-bison_object_wasm = $(object_directory)/bison.o
+bison_object_native = $(native_object_directory)/bison.o
+bison_object_wasm = $(wasm_object_directory)/bison.o
 bison_grammar = grammar.y
 sources_all = $(wildcard $(source_directory)/*.c)
 sources_all += $(wildcard $(source_directory)/algorithm/*.c)
@@ -36,10 +40,11 @@ headers = $(wildcard $(header_directory)/*.h)
 
 headers_emcc = $(wildcard $(header_directory)/*.h)
 
-objects_all  := $(sources_all:$(source_directory)/%.c=$(object_directory)/%.o)
+objects_native_ = $(sources_all:$(source_directory)/%.c=$(native_object_directory)/%.o)
+objects_native = $(filter-out $(native_object_directory)/emcc.o,$(objects_native_))
 
-objects      = $(filter-out $(object_directory)/emcc.o,$(objects_all))
-objects_emcc = $(filter-out $(object_directory)/main.o,$(objects_all))
+objects_wasm_ = $(sources_all:$(source_directory)/%.c=$(wasm_object_directory)/%.o)
+objects_wasm = $(filter-out $(wasm_object_directory)/main.o,$(objects_wasm_))
 
 
 nil := 
@@ -50,7 +55,7 @@ gccflags = -Wall -Wpedantic -g -O3
 compiler_flags := $(gccflags) 
 includes := -I$(header_directory)
 libraries := 
-wasm_flags := -s LINKABLE=1 -sEXPORTED_RUNTIME_METHODS=ccall
+wasm_flags := 
 
 define speaker
 	@echo [make:$$PPID] $(1)
@@ -61,49 +66,51 @@ all: native wasm
 
 native: $(binary_directory)/$(target)
 
-wasm: $(binary_directory)/$(target_emcc)
-
-$(binary_directory)/$(target): $(bison_object) $(objects) 
+$(binary_directory)/$(target): $(bison_object_native) $(objects_native) 
 	$(call speaker,\
-	$(cc) $(objects) $(bison_object) -o $@ $(libraries))
+	$(cc) $(objects_native) $(bison_object_native) -o $@ $(libraries))
 
-$(binary_directory)/$(target_emcc): $(bison_object_wasm) $(objects_emcc) 
+$(objects_native): $(native_object_directory)/%.o: $(source_directory)/%.$(source_ext) 
+	mkdir -p $(native_object_directory)
+	mkdir -p $(native_object_directory)/algorithm
+	mkdir -p $(native_object_directory)/context
+	mkdir -p $(native_object_directory)/grammar
 	$(call speaker,\
-	$(wc) $(objects_emcc) $(bison_object_wasm) -o $@ $(wasm_flags))
+	$(cc) $(compiler_flags) -c $< -o $@ $(includes)) 
 
-$(objects): $(object_directory)/%.o: $(source_directory)/%.$(source_ext) 
-	mkdir -p object
-	mkdir -p object/algorithm
-	mkdir -p object/context
-	mkdir -p object/grammar
+$(bison_object_native): $(bison_source)
+	mkdir -p $(native_object_directory)
 	$(call speaker,\
 	$(cc) $(compiler_flags) -c $< -o $@ $(includes)) 
 
-$(objects_emcc): $(object_directory)/%.o: $(source_directory)/%.$(source_ext) 
-	mkdir -p object
-	mkdir -p object/algorithm
-	mkdir -p object/context
-	mkdir -p object/grammar
+$(bison_source): $(bison_grammar)
 	$(call speaker,\
-	$(wc) $(compiler_flags) -c $< -o $@ $(includes)) 
+	$(bc) -Wconflicts-sr -Wcounterexamples $< --output=$@ --defines=$(bison_header))
 
-$(bison_object): $(bison_source)
-	mkdir -p object
+wasm: $(binary_directory)/$(target_emcc)
+$(binary_directory)/$(target_emcc): $(bison_object_wasm) $(objects_wasm) 
 	$(call speaker,\
-	$(cc) $(compiler_flags) -c $< -o $@ $(includes)) 
-
-$(bison_object_wasm): $(bison_source)
-	mkdir -p object
+	$(wc) $(objects_wasm) $(bison_object_wasm) -o $@ $(wasm_flags))
+	
+$(objects_wasm): $(wasm_object_directory)/%.o: $(source_directory)/%.$(source_ext) 
+	mkdir -p $(wasm_object_directory)
+	mkdir -p $(wasm_object_directory)/algorithm
+	mkdir -p $(wasm_object_directory)/context
+	mkdir -p $(wasm_object_directory)/grammar
 	$(call speaker,\
 	$(wc) $(compiler_flags) -c $< -o $@ $(includes)) 
 
-$(bison_source): $(bison_grammar)
+$(bison_object_wasm): $(bison_source)
+	mkdir -p $(wasm_object_directory)
 	$(call speaker,\
-	$(bc) -Wconflicts-sr -Wcounterexamples $< --output=$@ --defines=$(bison_header))
+	$(wc) $(compiler_flags) -c $< -o $@ $(includes)) 
 
 .PHONY: clean
 clean:
-	@$(rm) $(objects_all)
+	@$(rm) $(objects_native)
+	@$(rm) $(objects_wasm)
+	@$(rm) $(bison_object_native)
+	@$(rm) $(bison_object_wasm)
 	@$(rm) $(bison_source)
 	@$(rm) $(bison_header)