update Makefile

This commit is contained in:
Michael Davidsaver
2013-12-08 15:53:57 -05:00
parent 639baab55d
commit 01331ed3f5
5 changed files with 36 additions and 17 deletions

View File

@ -12,10 +12,10 @@ $(foreach dir, $(filter-out configure,$(DIRS)),$(eval $(call DIR_template,$(dir)
iocBoot_DEPEND_DIRS += $(filter %App,$(DIRS))
UNINSTALL_DIRS += $(TOP)/python
include $(TOP)/configure/RULES_TOP
UNINSTALL_DIRS += $(wildcard $(INSTALL_LOCATION)/python*)
#useful targets includ: doc-html and doc-clean
doc-%:
PYTHONPATH=$$PWD/python $(MAKE) -C documentation $*

28
configure/CONFIG_PY Normal file
View 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

View File

@ -1,6 +1,8 @@
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)/%)

View File

@ -1,24 +1,12 @@
TOP=../..
include $(TOP)/configure/CONFIG
PYMODULE = NO
include $(TOP)/configure/CONFIG_PY
#----------------------------------------
# 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

View File

@ -1,5 +1,6 @@
TOP=..
include $(TOP)/configure/CONFIG
include $(TOP)/configure/CONFIG_PY
#----------------------------------------
# ADD MACRO DEFINITIONS AFTER THIS LINE