summaryrefslogtreecommitdiffstatshomepage
path: root/unix/Makefile
diff options
context:
space:
mode:
authorDamien George <damien.p.george@gmail.com>2014-05-24 23:03:12 +0100
committerDamien George <damien.p.george@gmail.com>2014-05-24 23:03:12 +0100
commitee3fd46f1383e984c968c4a82d634d7b0cea49b8 (patch)
tree76eb38f9015df5d003f646ce019745426365021c /unix/Makefile
parentd0ceb04b90ca7edd7e45b8eff1cdebdfa20a0cf8 (diff)
downloadmicropython-ee3fd46f1383e984c968c4a82d634d7b0cea49b8.tar.gz
micropython-ee3fd46f1383e984c968c4a82d634d7b0cea49b8.zip
Rename configuration variables controling Python features.
Now of the form MICROPY_PY_*. See issue #35.
Diffstat (limited to 'unix/Makefile')
-rw-r--r--unix/Makefile10
1 files changed, 5 insertions, 5 deletions
diff --git a/unix/Makefile b/unix/Makefile
index 4dcba22e23..ffc3391a14 100644
--- a/unix/Makefile
+++ b/unix/Makefile
@@ -27,7 +27,7 @@ UNAME_S := $(shell uname -s)
ifeq ($(MICROPY_FORCE_32BIT),1)
CFLAGS += -m32
LDFLAGS += -m32
-ifeq ($(MICROPY_MOD_FFI),1)
+ifeq ($(MICROPY_PY_FFI),1)
ifeq ($(UNAME_S),Linux)
CFLAGS_MOD += -I/usr/include/i686-linux-gnu
endif
@@ -40,14 +40,14 @@ LDFLAGS_MOD += -lreadline
# the following is needed for BSD
#LDFLAGS_MOD += -ltermcap
endif
-ifeq ($(MICROPY_MOD_TIME),1)
-CFLAGS_MOD += -DMICROPY_MOD_TIME=1
+ifeq ($(MICROPY_PY_TIME),1)
+CFLAGS_MOD += -DMICROPY_PY_TIME=1
SRC_MOD += modtime.c
endif
-ifeq ($(MICROPY_MOD_FFI),1)
+ifeq ($(MICROPY_PY_FFI),1)
LIBFFI_LDFLAGS_MOD := $(shell pkg-config --libs libffi)
LIBFFI_CFLAGS_MOD := $(shell pkg-config --cflags libffi)
-CFLAGS_MOD += $(LIBFFI_CFLAGS_MOD) -DMICROPY_MOD_FFI=1
+CFLAGS_MOD += $(LIBFFI_CFLAGS_MOD) -DMICROPY_PY_FFI=1
LDFLAGS_MOD += -ldl $(LIBFFI_LDFLAGS_MOD)
SRC_MOD += modffi.c
endif