update Makefile
This commit is contained in:
4
Makefile
4
Makefile
@ -12,10 +12,10 @@ $(foreach dir, $(filter-out configure,$(DIRS)),$(eval $(call DIR_template,$(dir)
|
|||||||
|
|
||||||
iocBoot_DEPEND_DIRS += $(filter %App,$(DIRS))
|
iocBoot_DEPEND_DIRS += $(filter %App,$(DIRS))
|
||||||
|
|
||||||
UNINSTALL_DIRS += $(TOP)/python
|
|
||||||
|
|
||||||
include $(TOP)/configure/RULES_TOP
|
include $(TOP)/configure/RULES_TOP
|
||||||
|
|
||||||
|
UNINSTALL_DIRS += $(wildcard $(INSTALL_LOCATION)/python*)
|
||||||
|
|
||||||
#useful targets includ: doc-html and doc-clean
|
#useful targets includ: doc-html and doc-clean
|
||||||
doc-%:
|
doc-%:
|
||||||
PYTHONPATH=$$PWD/python $(MAKE) -C documentation $*
|
PYTHONPATH=$$PWD/python $(MAKE) -C documentation $*
|
||||||
|
28
configure/CONFIG_PY
Normal file
28
configure/CONFIG_PY
Normal file
@ -0,0 +1,28 @@
|
|||||||
|
PYMODULE ?= YES
|
||||||
|
|
||||||
|
ifneq ($(T_A),)
|
||||||
|
|
||||||
|
include $(TOP)/configure/O.$(T_A)/CONFIG_PY
|
||||||
|
ifneq ($(PY_OK),YES)
|
||||||
|
$(error Unable to get python configuration)
|
||||||
|
endif
|
||||||
|
|
||||||
|
USR_CPPFLAGS += $(PY_INCDIRS:%=-I%)
|
||||||
|
USR_LDFLAGS += $(PY_LIBDIRS:%=-L%)
|
||||||
|
|
||||||
|
ifeq ($(HAVE_NUMPY),YES)
|
||||||
|
USR_CPPFLAGS += -DHAVE_NUMPY
|
||||||
|
endif
|
||||||
|
|
||||||
|
LIB_SYS_LIBS += python$(PY_VER)
|
||||||
|
|
||||||
|
PY_INSTALL_DIR = $(INSTALL_LOCATION)/python$(PY_VER)/$(T_A)
|
||||||
|
|
||||||
|
# Python loadables have no prefix (eg 'pymod.so')
|
||||||
|
# and are installed alongsize .py files
|
||||||
|
LOADABLE_SHRLIB_PREFIX =
|
||||||
|
ifneq ($(PYMODULE),NO)
|
||||||
|
INSTALL_SHRLIB = $(PY_INSTALL_DIR)
|
||||||
|
endif
|
||||||
|
|
||||||
|
endif
|
@ -1,6 +1,8 @@
|
|||||||
ifneq ($(T_A),)
|
ifneq ($(T_A),)
|
||||||
|
|
||||||
PY_INSTALL_DIR = $(INSTALL_LOCATION)/python/$(T_A)
|
ifndef PY_VER
|
||||||
|
$(error Must include CONFIG_PY)
|
||||||
|
endif
|
||||||
|
|
||||||
PY_FILES += $(PY:%=$(PY_INSTALL_DIR)/%)
|
PY_FILES += $(PY:%=$(PY_INSTALL_DIR)/%)
|
||||||
|
|
||||||
|
@ -1,24 +1,12 @@
|
|||||||
TOP=../..
|
TOP=../..
|
||||||
|
|
||||||
include $(TOP)/configure/CONFIG
|
include $(TOP)/configure/CONFIG
|
||||||
|
PYMODULE = NO
|
||||||
|
include $(TOP)/configure/CONFIG_PY
|
||||||
#----------------------------------------
|
#----------------------------------------
|
||||||
# ADD MACRO DEFINITIONS AFTER THIS LINE
|
# ADD MACRO DEFINITIONS AFTER THIS LINE
|
||||||
#=============================
|
#=============================
|
||||||
|
|
||||||
ifdef T_A
|
|
||||||
include $(TOP)/configure/O.$(T_A)/CONFIG_PY
|
|
||||||
ifneq ($(PY_OK),YES)
|
|
||||||
$(error Unable to get python configuration)
|
|
||||||
endif
|
|
||||||
endif
|
|
||||||
|
|
||||||
USR_CPPFLAGS += $(PY_INCDIRS:%=-I%)
|
|
||||||
USR_LDFLAGS += $(PY_LIBDIRS:%=-L%)
|
|
||||||
|
|
||||||
ifeq ($(HAVE_NUMPY),YES)
|
|
||||||
USR_CPPFLAGS += -DHAVE_NUMPY
|
|
||||||
endif
|
|
||||||
|
|
||||||
#=============================
|
#=============================
|
||||||
# Build the IOC application
|
# Build the IOC application
|
||||||
|
|
||||||
|
@ -1,5 +1,6 @@
|
|||||||
TOP=..
|
TOP=..
|
||||||
include $(TOP)/configure/CONFIG
|
include $(TOP)/configure/CONFIG
|
||||||
|
include $(TOP)/configure/CONFIG_PY
|
||||||
#----------------------------------------
|
#----------------------------------------
|
||||||
# ADD MACRO DEFINITIONS AFTER THIS LINE
|
# ADD MACRO DEFINITIONS AFTER THIS LINE
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user