Skip to content

Commit

Permalink
Merge pull request #461 from kahnevan/fapi_remove
Browse files Browse the repository at this point in the history
Remove fapiClientCapi.C reference from perl/python makefiles since it…
  • Loading branch information
kahnevan authored Jun 16, 2021
2 parents 37baff5 + 8dec4b0 commit f619c68
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 4 deletions.
3 changes: 1 addition & 2 deletions ecmd-core/perlapi/makefile
Original file line number Diff line number Diff line change
Expand Up @@ -44,9 +44,8 @@ VPATH := ${VPATH}:${ECMD_CORE}/capi:${SRCPATH}:distro/${INC_DISTRO}:${OBJPATH
### Add all of the extension information onto our variables
INCLUDES := ${INCLUDES} $(foreach ext, ${EXT_PYAPI}, ${ext}ClientPerlapi.H ${ext}ClientCapi.H)
SOURCE := ${SOURCE} $(foreach ext, ${EXT_PYAPI}, ${ext}ClientPerlapi.C ${ext}ClientPerlapiFunc.C)
# Remove the fapiClientPerlapiFunc.C from the build, only will use fapiClientPerlapi.C which has the init extension
# Remove the fapi2ClientPerlapiFunc.C from the build, only will use fapi2ClientPerlapi.C which has the init extension
SOURCE := $(subst fapi2ClientPerlapiFunc.C,,${SOURCE})
SOURCE := $(subst fapiClientPerlapiFunc.C,,${SOURCE})
CXXFLAGS := ${CXXFLAGS} $(foreach ext, ${EXT_PYAPI},-I${EXT_${ext}_PATH}/capi -I${EXT_${ext}_PATH}/perlapi)
SWIGFLAGS := ${SWIGFLAGS} $(foreach ext, ${EXT_PYAPI},-I${EXT_${ext}_PATH}/perlapi -I${EXT_${ext}_PATH}/capi)
VPATH := ${VPATH}$(foreach ext, ${EXT_PYAPI},:${EXT_${ext}_PATH}/capi:${EXT_${ext}_PATH}/perlapi)
Expand Down
2 changes: 0 additions & 2 deletions ecmd-core/pyapi/makefile
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,6 @@ VPATH := ${VPATH}:${ECMD_CORE}/capi:${SRCPATH}:${OBJPATH}
### Add all of the extension information onto our variables
INCLUDES := ${INCLUDES} $(foreach ext, ${EXT_PYAPI}, ${ext}ClientCapi.H ${ext}ClientPyapi.H)
SOURCE := ${SOURCE} $(foreach ext, ${EXT_PYAPI}, ${ext}ClientCapi.C ${ext}ClientPyapi.C)
# Remove the fapiClientCapi.C from the build, only will use fapiClientPyapi.C which has the init extension
SOURCE := $(subst fapiClientCapi.C,,${SOURCE})
CXXFLAGS := ${CXXFLAGS} $(foreach ext, ${EXT_PYAPI},-I${EXT_${ext}_PATH}/capi -I${EXT_${ext}_PATH}/pyapi)
SWIGFLAGS := ${SWIGFLAGS} $(foreach ext, ${EXT_PYAPI},-I${EXT_${ext}_PATH}/capi -I${EXT_${ext}_PATH}/pyapi)
VPATH := ${VPATH}$(foreach ext, ${EXT_PYAPI},:${EXT_${ext}_PATH}/capi:${EXT_${ext}_PATH}/pyapi)
Expand Down

0 comments on commit f619c68

Please sign in to comment.