49
49
# - Create TARGET directory if it doesn't exist - MT
50
50
# - Fixed error in directory path when TARGET is defined
51
51
# on the command line - MT
52
+ # - Simplified directory creation - MT
52
53
#
53
54
54
- PROGRAM = x11-calc
55
+ PROGRAM = x11-calc
55
56
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
61
62
62
63
SOURCES = $(wildcard $(SRC)/*.c) $(wildcard $(SRC)/*.h)
63
64
SOURCES += $(wildcard make.sh*) $(wildcard make.com*) $(wildcard makefile*) $(wildcard $(SRC)/makefile*)
@@ -93,26 +94,20 @@ spice: clean $(SPICE) $(OTHERS)
93
94
voyager: clean $(VOYAGER) $(OTHERS)
94
95
95
96
define prog_template =
96
- hp$(1): $(1)
97
- $(1): $(SOURCES)
97
+ hp$(1): $(1) $(TARGET)
98
+ $(1): $(SOURCES) $(TARGET)
98
99
@$$(MAKE) MODEL=$(1) TARGET=../$(TARGET)
99
100
endef
100
101
101
102
$(foreach calc,$(ALL),$(eval $(call prog_template,$(calc))))
102
103
103
- launcher: $(SRC)/x11-calc.in
104
- ifeq ($(wildcard $(TARGET)/.),)
105
- @mkdir -p $(TARGET)
106
- endif
104
+ launcher: $(SRC)/x11-calc.in $(TARGET)
107
105
# @install -m755 $(SRC)/x11-calc.in $(TARGET)/x11-calc.sh
108
106
@cp $(SRC)/x11-calc.in $(TARGET)/x11-calc.sh
109
107
@chmod +x $(TARGET)/x11-calc.sh
110
108
( cd $(TARGET) && ls --color x11-calc.sh )
111
109
112
- desktop: $(SRC)/x11-calc.desktop
113
- ifeq ($(wildcard $(TARGET)/.),)
114
- @mkdir -p $(TARGET)
115
- endif
110
+ desktop: $(SRC)/x11-calc.desktop $(TARGET)
116
111
# @install -m644 $(SRC)/x11-calc.desktop $(TARGET)
117
112
@cp $(SRC)/x11-calc.desktop $(TARGET)
118
113
@chmod +x $(TARGET)/x11-calc.desktop
@@ -122,6 +117,9 @@ endif
122
117
done
123
118
( cd $(TARGET) && ls --color x11-calc.desktop )
124
119
120
+ $(TARGET):
121
+ @mkdir -p $(TARGET)
122
+
125
123
clean:
126
124
@rm -f $(SRC)/*.o $(TARGET)/x11-calc.desktop*
127
125
@test -d $(TARGET) && (cd $(TARGET) && rm -f *) || true
0 commit comments