Skip to content

Commit 25f88c9

Browse files
committed
Simplified directory creation
1 parent a2b9161 commit 25f88c9

File tree

1 file changed

+14
-16
lines changed

1 file changed

+14
-16
lines changed

makefile.linux

+14-16
Original file line numberDiff line numberDiff line change
@@ -49,15 +49,16 @@
4949
# - Create TARGET directory if it doesn't exist - MT
5050
# - Fixed error in directory path when TARGET is defined
5151
# on the command line - MT
52+
# - Simplified directory creation - MT
5253
#
5354

54-
PROGRAM = x11-calc
55+
PROGRAM = x11-calc
5556

56-
TARGET := ./bin
57-
SRC := ./src
58-
PRG := ./prg
59-
ROM := ./rom
60-
IMG := ./img
57+
TARGET := ./bin
58+
SRC := ./src
59+
PRG := ./prg
60+
ROM := ./rom
61+
IMG := ./img
6162

6263
SOURCES = $(wildcard $(SRC)/*.c) $(wildcard $(SRC)/*.h)
6364
SOURCES += $(wildcard make.sh*) $(wildcard make.com*) $(wildcard makefile*) $(wildcard $(SRC)/makefile*)
@@ -93,26 +94,20 @@ spice: clean $(SPICE) $(OTHERS)
9394
voyager: clean $(VOYAGER) $(OTHERS)
9495

9596
define prog_template =
96-
hp$(1): $(1)
97-
$(1): $(SOURCES)
97+
hp$(1): $(1) $(TARGET)
98+
$(1): $(SOURCES) $(TARGET)
9899
@$$(MAKE) MODEL=$(1) TARGET=../$(TARGET)
99100
endef
100101

101102
$(foreach calc,$(ALL),$(eval $(call prog_template,$(calc))))
102103

103-
launcher: $(SRC)/x11-calc.in
104-
ifeq ($(wildcard $(TARGET)/.),)
105-
@mkdir -p $(TARGET)
106-
endif
104+
launcher: $(SRC)/x11-calc.in $(TARGET)
107105
# @install -m755 $(SRC)/x11-calc.in $(TARGET)/x11-calc.sh
108106
@cp $(SRC)/x11-calc.in $(TARGET)/x11-calc.sh
109107
@chmod +x $(TARGET)/x11-calc.sh
110108
( cd $(TARGET) && ls --color x11-calc.sh )
111109

112-
desktop: $(SRC)/x11-calc.desktop
113-
ifeq ($(wildcard $(TARGET)/.),)
114-
@mkdir -p $(TARGET)
115-
endif
110+
desktop: $(SRC)/x11-calc.desktop $(TARGET)
116111
# @install -m644 $(SRC)/x11-calc.desktop $(TARGET)
117112
@cp $(SRC)/x11-calc.desktop $(TARGET)
118113
@chmod +x $(TARGET)/x11-calc.desktop
@@ -122,6 +117,9 @@ endif
122117
done
123118
( cd $(TARGET) && ls --color x11-calc.desktop )
124119

120+
$(TARGET):
121+
@mkdir -p $(TARGET)
122+
125123
clean:
126124
@rm -f $(SRC)/*.o $(TARGET)/x11-calc.desktop*
127125
@test -d $(TARGET) && (cd $(TARGET) && rm -f *) || true

0 commit comments

Comments
 (0)