Fix project not recompiled when source of lib is modified

Lecrapouille · May 1, 2024 · 5c4dec1 · 5c4dec1
1 parent a9c5f82
commit 5c4dec1
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 31 deletions.
diff --git a/.makefile b/.makefile
diff --git a/Makefile b/Makefile
@@ -11,13 +11,6 @@ include $(P)/Makefile.common
 TARGET = $(PROJECT)
 DESCRIPTION = Timed Petri Net Editor
 
-###################################################
-# Other targets
-#
-LIB_TPNE_CORE = $(abspath $(P)/src/Net/$(BUILD)/libtimedpetrinetcore.a)
-LIB_TPNE_GUI = $(abspath $(P)/src/Editor/$(BUILD)/libtimedpetrinetgui.a)
-LIB_TPNE_JULIA = $(abspath $(P)/src/julia/$(BUILD)/libtimedpetrinetjulia.a)
-
 ###################################################
 # Sharable informations between all Makefiles
 #
@@ -63,8 +56,6 @@ endif
 # Stand-alone application.
 #
 include $(P)/src/Editor/DearImGui/Makefile.imgui
-THIRDPART_LIBS += $(LIB_TPNE_GUI) $(LIB_TPNE_CORE)
-THIRDPART_LIBS += $(LIB_TPNE_JULIA)
 LINKER_FLAGS += -ldl -lpthread
 VPATH += $(P)/include $(P)/src $(P)/src/Utils $(P)/src/Net
 VPATH += $(P)/src/Net/Imports VPATH += $(P)/src/Net/Exports
@@ -74,31 +65,26 @@ OBJS += main.o
 ###################################################
 # Compile the stand-alone application
 .PHONY: all
-all: | $(LIB_TPNE_GUI) $(LIB_TPNE_CORE) $(LIB_TPNE_JULIA)
-all: $(TARGET) $(LIB_TPNE_GUI) $(LIB_TPNE_CORE) $(LIB_TPNE_JULIA) copy-emscripten-assets
+all: $(TARGET) copy-emscripten-assets
 
 ###################################################
-# Compile The Petri net core lib
-$(LIB_TPNE_CORE): src/Net/Makefile Makefile
-	@$(call print-from,"Compiling Petri net core lib",$(PROJECT),core)
-	@$(MAKE) -C src/Net all
-	@cp $(LIB_TPNE_CORE) $(BUILD)
+# Internal libraries
+#
+LIB_TPNE_CORE = $(abspath $(P)/$(BUILD)/libtimedpetrinetcore.a)
+LIB_TPNE_GUI = $(abspath $(P)/$(BUILD)/libtimedpetrinetgui.a)
+LIB_TPNE_JULIA = $(abspath $(P)/$(BUILD)/libtimedpetrinetjulia.a)
+INTERNAL_LIBS += $(LIB_TPNE_GUI) $(LIB_TPNE_CORE) $(LIB_TPNE_JULIA)
+DIRS_WITH_MAKEFILE := src/Editor src/Net src/julia
 
-###################################################
-# Compile The Petri net gui lib 
-$(LIB_TPNE_GUI): | $(LIB_TPNE_CORE)
-$(LIB_TPNE_GUI): src/Editor/Makefile Makefile
-	@$(call print-from,"Compiling Petri net GUI lib",$(PROJECT),gui)
-	@$(MAKE) -C src/Editor all
-	@cp $(LIB_TPNE_GUI) $(BUILD)
+$(LIB_TPNE_GUI): src/Editor
 
-###################################################
-# Compile interface for Julia
-$(LIB_TPNE_JULIA): | $(LIB_TPNE_GUI)
-$(LIB_TPNE_JULIA): $(LIB_TPNE_GUI) $(LIB_TPNE_CORE) src/julia/Makefile Makefile
-	@$(call print-from,"Compiling Interface for Julia-lang",$(PROJECT),Julia-lang)
-	@$(MAKE) -C src/julia all
-	@cp $(LIB_TPNE_JULIA) $(BUILD)
+$(LIB_TPNE_CORE): src/Net
+
+$(LIB_TPNE_JULIA): src/julia
+
+src/julia: src/Editor
+
+src/Editor: src/Net
 
 ###################################################
 # Copy data inside BUILD to allow emscripten to embedded them

diff --git a/src/Editor/Makefile b/src/Editor/Makefile
@@ -3,6 +3,7 @@
 #
 P := ../..
 M := $(P)/.makefile
+BUILD := $(P)/build
 
 ###################################################
 # Project definition

diff --git a/src/Net/Makefile b/src/Net/Makefile
@@ -3,6 +3,7 @@
 #
 P := ../..
 M := $(P)/.makefile
+BUILD := $(P)/build
 
 ###################################################
 # Project definition

diff --git a/src/julia/Makefile b/src/julia/Makefile
@@ -3,6 +3,7 @@
 #
 P := ../..
 M := $(P)/.makefile
+BUILD := $(P)/build
 
 ###################################################
 # Project definition
+21 −0		Makefile.flags
+6 −15		Makefile.footer
+5 −0		Makefile.header
+46 −1		README.md