8000 unix/Makefile: Don't use _MOD variable names. · micropython/micropython@579bc8f · GitHub
[go: up one dir, main page]
Skip to content

Commit 579bc8f

Browse files
jimmoletgo0007
jimmo
authored and
letgo0007
committed
unix/Makefile: Don't use _MOD variable names.
This conflicts with the triple-usage of these variables for user-C-modules and extmod source. For CFLAGS_MOD, just use CFLAGS directly. For SRC, use SRC_C directly as the relevant files are all guarded by the preprocessor anyway. Signed-off-by: Jim Mussared <jim.mussared@gmail.com>
1 parent 5c6feb6 commit 579bc8f

File tree

2 files changed

+28
-28
lines changed

2 files changed

+28
-28
lines changed

‎ports/unix/Makefile

Lines changed: 23 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -110,27 +110,25 @@ ifeq ($(MICROPY_FORCE_32BIT),1)
110110
# starting with linux-libc-dev:i386
111111
ifeq ($(MICROPY_PY_FFI),1)
112112
ifeq ($(UNAME_S),Linux)
113-
CFLAGS_MOD += -I/usr/include/i686-linux-gnu
113+
CFLAGS += -I/usr/include/i686-linux-gnu
114114
endif
115115
endif
116116
endif
117117

118118
ifeq ($(MICROPY_USE_READLINE),1)
119119
INC += -I$(TOP)/shared/readline
120-
CFLAGS_MOD += -DMICROPY_USE_READLINE=1
120+
CFLAGS += -DMICROPY_USE_READLINE=1
121121
SHARED_SRC_C_EXTRA += readline/readline.c
122122
endif
123123
ifeq ($(MICROPY_PY_TERMIOS),1)
124-
CFLAGS_MOD += -DMICROPY_PY_TERMIOS=1
125-
SRC_MOD += modtermios.c
124+
CFLAGS += -DMICROPY_PY_TERMIOS=1
126125
endif
127126
ifeq ($(MICROPY_PY_SOCKET),1)
128-
CFLAGS_MOD += -DMICROPY_PY_SOCKET=1
129-
SRC_MOD += modusocket.c
127+
CFLAGS += -DMICROPY_PY_SOCKET=1
130128
endif
131129
ifeq ($(MICROPY_PY_THREAD),1)
132-
CFLAGS_MOD += -DMICROPY_PY_THREAD=1 -DMICROPY_PY_THREAD_GIL=0
133-
LDFLAGS_MOD += $(LIBPTHREAD)
130+
CFLAGS += -DMICROPY_PY_THREAD=1 -DMICROPY_PY_THREAD_GIL=0
131+
LDFLAGS += $(LIBPTHREAD)
134132
endif
135133

136134
ifeq ($(MICROPY_PY_USSL),1)
@@ -139,7 +137,7 @@ GIT_SUBMODULES += lib/axtls
139137
endif
140138
ifeq ($(MICROPY_SSL_MBEDTLS),1)
141139
GIT_SUBMODULES += lib/mbedtls
142-
CFLAGS_MOD += -DMBEDTLS_CONFIG_FILE='"mbedtls/mbedtls_config.h"'
140+
CFLAGS += -DMBEDTLS_CONFIG_FILE='"mbedtls/mbedtls_config.h"'
143141
endif
144142
endif
145143

@@ -163,8 +161,8 @@ MICROPY_BLUETOOTH_BTSTACK ?= 1
163161
endif
164162
endif
165163

166-
CFLAGS_MOD += -DMICROPY_PY_BLUETOOTH=1
167-
CFLAGS_MOD += -DMICROPY_PY_BLUETOOTH_ENABLE_CENTRAL_MODE=1
164+
CFLAGS += -DMICROPY_PY_BLUETOOTH=1
165+
CFLAGS += -DMICROPY_PY_BLUETOOTH_ENABLE_CENTRAL_MODE=1
168166

169167
ifeq ($(MICROPY_BLUETOOTH_BTSTACK),1)
170168

@@ -192,7 +190,7 @@ else
192190

193191
# NimBLE is enabled.
194192
GIT_SUBMODULES += lib/mynewt-nimble
195-
CFLAGS_MOD += -DMICROPY_PY_BLUETOOTH_ENABLE_L2CAP_CHANNELS=1
193+
CFLAGS += -DMICROPY_PY_BLUETOOTH_ENABLE_L2CAP_CHANNELS=1
196194
include $(TOP)/extmod/nimble/nimble.mk
197195

198196
endif
@@ -205,31 +203,29 @@ ifeq ($(MICROPY_STANDALONE),1)
205203
# Build libffi from source.
206204
GIT_SUBMODULES += lib/libffi
207205
DEPLIBS += libffi
208-
LIBFFI_CFLAGS_MOD := -I$(shell ls -1d $(BUILD)/lib/libffi/out/lib/libffi-*/include)
206+
LIBFFI_CFLAGS := -I$(shell ls -1d $(BUILD)/lib/libffi/out/lib/libffi-*/include)
209207
ifeq ($(MICROPY_FORCE_32BIT),1)
210-
LIBFFI_LDFLAGS_MOD = $(BUILD)/lib/libffi/out/lib32/libffi.a
208+
LIBFFI_LDFLAGS = $(BUILD)/lib/libffi/out/lib32/libffi.a
211209
else
212-
LIBFFI_LDFLAGS_MOD = $(BUILD)/lib/libffi/out/lib/libffi.a
210+
LIBFFI_LDFLAGS = $(BUILD)/lib/libffi/out/lib/libffi.a
213211
endif
214212
else
215213
# Use system version of libffi.
216-
LIBFFI_CFLAGS_MOD := $(shell pkg-config --cflags libffi)
217-
LIBFFI_LDFLAGS_MOD := $(shell pkg-config --libs libffi)
214+
LIBFFI_CFLAGS := $(shell pkg-config --cflags libffi)
215+
LIBFFI_LDFLAGS := $(shell pkg-config --libs libffi)
218216
endif
219217

220218
ifeq ($(UNAME_S),Linux)
221-
LIBFFI_LDFLAGS_MOD += -ldl
219+
LIBFFI_LDFLAGS += -ldl
222220
endif
223221

224-
CFLAGS_MOD += $(LIBFFI_CFLAGS_MOD) -DMICROPY_PY_FFI=1
225-
LDFLAGS_MOD += $(LIBFFI_LDFLAGS_MOD)
226-
SRC_MOD += modffi.c
222+
CFLAGS += $(LIBFFI_CFLAGS) -DMICROPY_PY_FFI=1
223+
LDFLAGS += $(LIBFFI_LDFLAGS)
227224
endif
228225

229226
ifeq ($(MICROPY_PY_JNI),1)
230227
# Path for 64-bit OpenJDK, should be adjusted for other JDKs
231-
CFLAGS_MOD += -I/usr/lib/jvm/java-7-openjdk-amd64/include -DMICROPY_PY_JNI=1
232-
SRC_MOD += modjni.c
228+
CFLAGS += -I/usr/lib/jvm/java-7-openjdk-amd64/include -DMICROPY_PY_JNI=1
233229
endif
234230

235231
# source files
@@ -250,6 +246,10 @@ SRC_C += \
250246
mpbtstackport_usb.c \
251247
mpnimbleport.c \
252248
$(SRC_MOD) \
249+
modtermios.c \
250+
modusocket.c \
251+
modffi.c \
252+
modjni.c \
253253
$(wildcard $(VARIANT_DIR)/*.c)
254254

255255
SHARED_SRC_C += $(addprefix shared/,\

‎ports/unix/modjni.c

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -24,19 +24,19 @@
2424
* THE SOFTWARE.
2525
*/
2626

27+
#include "py/runtime.h"
28+
#include "py/binary.h"
29+
30+
#if MICROPY_PY_JNI
31+
2732
#include <assert.h>
2833
#include <string.h>
2934
#include <errno.h>
3035
#include <dlfcn.h>
3136
#include <ctype.h>
3237

33-
#include "py/runtime.h"
34-
#include "py/binary.h"
35-
3638
#include <jni.h>
3739

38-
#if MICROPY_PY_JNI
39-
4040
#define JJ(call, ...) (*env)->call(env, __VA_ARGS__)
4141
#define JJ1(call) (*env)->call(env)
4242
#define MATCH(s, static) (!strncmp(s, static, sizeof(static) - 1))

0 commit comments

Comments
 (0)
0