always-cautious/ortools-clone
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

make: Fix rules overwrite

Browse Source
This commit is contained in:
Corentin Le Molgat
2022-10-19 17:51:20 +02:00
parent 6d1dd32974
commit cde57b01b8
3 changed files with 19 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
makefiles/Makefile.java.mk
View File

@@ -168,6 +168,7 @@ $(TEMP_JAVA_DIR)/$1/%/$(JAVA_SRC_DIR)/%.java: \
rjava_%: \
java \
$(SRC_DIR)/ortools/$1/samples/%.java \
$(TEMP_JAVA_DIR)/$1/%/pom.xml \
$(TEMP_JAVA_DIR)/$1/%/$(JAVA_SRC_DIR)/%.java \
FORCE
@@ -219,6 +220,7 @@ $(TEMP_JAVA_DIR)/$1/%/$(JAVA_SRC_DIR)/%.java: \
rjava_%: \
java \
$(SRC_DIR)/examples/$1/%.java \
$(TEMP_JAVA_DIR)/$1/%/pom.xml \
$(TEMP_JAVA_DIR)/$1/%/$(JAVA_SRC_DIR)/%.java \
FORCE
@@ -265,6 +267,7 @@ $(TEMP_JAVA_DIR)/$1/%/$(JAVA_TEST_DIR)/%.java: \
rjava_%: \
java \
$(SRC_DIR)/ortools/$1/java/%.java \
$(TEMP_JAVA_DIR)/$1/%/pom.xml \
$(TEMP_JAVA_DIR)/$1/%/$(JAVA_TEST_DIR)/%.java \
FORCE