From d62a50a188e388ac82764e793043b196e6947326 Mon Sep 17 00:00:00 2001 From: Jesper Saastamoinen Date: Fri, 13 Dec 2024 07:22:47 +0100 Subject: [PATCH] Update Makefile Updated Makefile to better handle stdlib --- src/Makefile | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/Makefile b/src/Makefile index eb84ad6..5ce1355 100644 --- a/src/Makefile +++ b/src/Makefile @@ -1,4 +1,5 @@ FILE_PATH = ./com/jsaasta/froj +FILE_PATH_STDLIB = $(FILE_PATH)/stdlib FILE = ../hello_world.froj FILE_NAME_JAR = froj.jar @@ -7,14 +8,14 @@ all: run compile: rm -f $(FILE_PATH)/*.class javac -d ./ $(FILE_PATH)/*.java $(FILE_PATH)/**/*.java - jar -cfm $(FILE_NAME_JAR) ./META-INF/MANIFEST.MF $(FILE_PATH)/*.class $(FILE_PATH)/**/*.class + jar -cfm $(FILE_NAME_JAR) ./META-INF/MANIFEST.MF $(FILE_PATH)/*.class $(FILE_PATH_STDLIB)/*.class rm -f $(FILE_PATH)/*.class - rm -f $(FILE_PATH)/*/*.class + rm -f $(FILE_PATH_STDLIB)/*.class clean: rm -f $(FILE_PATH)/*.class rm -f ./$(FILE_NAME_JAR) - rm -f $(FILE_PATH)/**/*.class + rm -f $(FILE_PATH_STDLIB)/*.class javac: javac -d ./ $(FILE_PATH)/*.java