Skip to content

Commit 65ef59a

Browse files
dpgeorgedpgeorge
committed
py/py.mk: Remove .. path component from list of extmod files.
This just makes it a bit cleaner in the output of the build process: instead of "CC ../../py/../extmod/" there is now "CC ../../extmod/".
1 parent 9df6451 commit 65ef59a

1 file changed

Lines changed: 38 additions & 37 deletions

File tree

‎py/py.mk‎

Lines changed: 38 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ $(BUILD)/extmod/modbtree.o: CFLAGS += $(BTREE_DEFS)
101101
endif
102102

103103
# py object files
104-
PY_CORE_O_BASENAME = \
104+
PY_CORE_O_BASENAME = $(addprefix py/,\
105105
mpstate.o \
106106
nlr.o \
107107
nlrx86.o \
@@ -214,44 +214,45 @@ PY_CORE_O_BASENAME = \
214214
repl.o \
215215
smallint.o \
216216
frozenmod.o \
217+
)
217218

218219
PY_EXTMOD_O_BASENAME = \
219-
../extmod/moductypes.o \
220-
../extmod/modujson.o \
221-
../extmod/modure.o \
222-
../extmod/moduzlib.o \
223-
../extmod/moduheapq.o \
224-
../extmod/modutimeq.o \
225-
../extmod/moduhashlib.o \
226-
../extmod/modubinascii.o \
227-
../extmod/virtpin.o \
228-
../extmod/machine_mem.o \
229-
../extmod/machine_pinbase.o \
230-
../extmod/machine_signal.o \
231-
../extmod/machine_pulse.o \
232-
../extmod/machine_i2c.o \
233-
../extmod/machine_spi.o \
234-
../extmod/modussl_axtls.o \
235-
../extmod/modussl_mbedtls.o \
236-
../extmod/modurandom.o \
237-
../extmod/moduselect.o \
238-
../extmod/modwebsocket.o \
239-
../extmod/modwebrepl.o \
240-
../extmod/modframebuf.o \
241-
../extmod/vfs.o \
242-
../extmod/vfs_reader.o \
243-
../extmod/vfs_fat.o \
244-
../extmod/vfs_fat_diskio.o \
245-
../extmod/vfs_fat_file.o \
246-
../extmod/vfs_fat_misc.o \
247-
../extmod/utime_mphal.o \
248-
../extmod/uos_dupterm.o \
249-
../lib/embed/abort_.o \
250-
../lib/utils/printf.o \
220+
extmod/moductypes.o \
221+
extmod/modujson.o \
222+
extmod/modure.o \
223+
extmod/moduzlib.o \
224+
extmod/moduheapq.o \
225+
extmod/modutimeq.o \
226+
extmod/moduhashlib.o \
227+
extmod/modubinascii.o \
228+
extmod/virtpin.o \
229+
extmod/machine_mem.o \
230+
extmod/machine_pinbase.o \
231+
extmod/machine_signal.o \
232+
extmod/machine_pulse.o \
233+
extmod/machine_i2c.o \
234+
extmod/machine_spi.o \
235+
extmod/modussl_axtls.o \
236+
extmod/modussl_mbedtls.o \
237+
extmod/modurandom.o \
238+
extmod/moduselect.o \
239+
extmod/modwebsocket.o \
240+
extmod/modwebrepl.o \
241+
extmod/modframebuf.o \
242+
extmod/vfs.o \
243+
extmod/vfs_reader.o \
244+
extmod/vfs_fat.o \
245+
extmod/vfs_fat_diskio.o \
246+
extmod/vfs_fat_file.o \
247+
extmod/vfs_fat_misc.o \
248+
extmod/utime_mphal.o \
249+
extmod/uos_dupterm.o \
250+
lib/embed/abort_.o \
251+
lib/utils/printf.o \
251252

252253
# prepend the build destination prefix to the py object files
253-
PY_CORE_O = $(addprefix $(PY_BUILD)/, $(PY_CORE_O_BASENAME))
254-
PY_EXTMOD_O = $(addprefix $(PY_BUILD)/, $(PY_EXTMOD_O_BASENAME))
254+
PY_CORE_O = $(addprefix $(BUILD)/, $(PY_CORE_O_BASENAME))
255+
PY_EXTMOD_O = $(addprefix $(BUILD)/, $(PY_EXTMOD_O_BASENAME))
255256

256257
# this is a convenience variable for ports that want core, extmod and frozen code
257258
PY_O = $(PY_CORE_O) $(PY_EXTMOD_O)
@@ -267,8 +268,8 @@ PY_O += $(BUILD)/$(BUILD)/frozen_mpy.o
267268
endif
268269

269270
# Sources that may contain qstrings
270-
SRC_QSTR_IGNORE = nlr% emitnx86% emitnx64% emitnthumb% emitnarm% emitnxtensa%
271-
SRC_QSTR = $(SRC_MOD) $(addprefix py/,$(filter-out $(SRC_QSTR_IGNORE),$(PY_CORE_O_BASENAME:.o=.c)) emitnative.c $(PY_EXTMOD_O_BASENAME:.o=.c))
271+
SRC_QSTR_IGNORE = py/nlr% py/emitnx86% py/emitnx64% py/emitnthumb% py/emitnarm% py/emitnxtensa%
272+
SRC_QSTR = $(SRC_MOD) $(filter-out $(SRC_QSTR_IGNORE),$(PY_CORE_O_BASENAME:.o=.c)) py/emitnative.c $(PY_EXTMOD_O_BASENAME:.o=.c)
272273

273274
# Anything that depends on FORCE will be considered out-of-date
274275
FORCE:

0 commit comments

Comments
 (0)