Skip to content

Commit c91b117

Browse files
committed
[pyext] Update Makefile.am with top_srcdir
1 parent 0a0ff45 commit c91b117

File tree

2 files changed

+6
-6
lines changed

2 files changed

+6
-6
lines changed

pyext/py2/Makefile.am

+3-3
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,12 @@ SOURCES=../pysairedis.h ../pysairedis.cpp
44
pkgpython_PYTHON = pysairedis.py __init__.py
55
pkgpyexec_LTLIBRARIES = _pysairedis.la
66

7-
INCLUDE=-I../../SAI/inc -I../../SAI/meta -I../../SAI/experimental -I../../lib/inc -I..
7+
AM_CXXFLAGS = -I$(top_srcdir)/SAI/inc -I$(top_srcdir)/SAI/experimental -I$(top_srcdir)/SAI/meta -I$(top_srcdir)/lib/inc -I..
88

99
BUILT_SOURCES = pysairedis_wrap.cpp
1010

1111
_pysairedis_la_SOURCES = pysairedis_wrap.cpp $(SOURCES)
12-
_pysairedis_la_CXXFLAGS = $(INCLUDE) -I/usr/include/python$(PYTHON_VERSION) $(AM_CXXFLAGS) $(CXXFLAGS_COMMON) \
12+
_pysairedis_la_CXXFLAGS = -I/usr/include/python$(PYTHON_VERSION) $(AM_CXXFLAGS) $(CXXFLAGS_COMMON) \
1313
-Wno-cast-qual -Wno-shadow -Wno-redundant-decls -Wno-conversion $(NO_CAST_FUNCTION_TYPE)
1414

1515
_pysairedis_la_LDFLAGS = -module \
@@ -26,6 +26,6 @@ SWIG_FLAG += -DSWIGWORDSIZE64
2626
endif
2727

2828
pysairedis_wrap.cpp: $(SWIG_SRC) $(SOURCES)
29-
$(SWIG) $(SWIG_FLAG) $(INCLUDE) -o $@ $<
29+
$(SWIG) $(SWIG_FLAG) $(AM_CXXFLAGS) -o $@ $<
3030

3131
CLEANFILES = pysairedis_wrap.cpp

pyext/py3/Makefile.am

+3-3
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,12 @@ SOURCES=../pysairedis.h ../pysairedis.cpp
44
pkgpython3_PYTHON = pysairedis.py __init__.py
55
pkgpy3exec_LTLIBRARIES = _pysairedis.la
66

7-
INCLUDE=-I../../SAI/inc -I../../SAI/meta -I../../SAI/experimental -I../../lib/inc -I..
7+
AM_CXXFLAGS = -I$(top_srcdir)/SAI/inc -I$(top_srcdir)/SAI/experimental -I$(top_srcdir)/SAI/meta -I$(top_srcdir)/lib/inc -I..
88

99
BUILT_SOURCES = pysairedis_wrap.cpp
1010

1111
_pysairedis_la_SOURCES = pysairedis_wrap.cpp $(SOURCES)
12-
_pysairedis_la_CXXFLAGS = $(INCLUDE) -I/usr/include/python$(PYTHON3_VERSION) $(AM_CXXFLAGS) $(CXXFLAGS_COMMON) \
12+
_pysairedis_la_CXXFLAGS = -I/usr/include/python$(PYTHON3_VERSION) $(AM_CXXFLAGS) $(CXXFLAGS_COMMON) \
1313
-Wno-cast-qual -Wno-shadow -Wno-redundant-decls -Wno-conversion $(NO_CAST_FUNCTION_TYPE)
1414

1515
_pysairedis_la_LDFLAGS = -module \
@@ -26,6 +26,6 @@ SWIG_FLAG += -DSWIGWORDSIZE64
2626
endif
2727

2828
pysairedis_wrap.cpp: $(SWIG_SRC) $(SOURCES)
29-
$(SWIG) $(SWIG_FLAG) $(INCLUDE) -o $@ $<
29+
$(SWIG) $(SWIG_FLAG) $(AM_CXXFLAGS) -o $@ $<
3030

3131
CLEANFILES = pysairedis_wrap.cpp

0 commit comments

Comments
 (0)