Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Do not use CPPFLAGS #7

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion modules/anypy/Makefile.am
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
pkgdatadir = @ZORP_PYTHON_DIR@
pkglibdir = @libdir@/zorp
LIBS = @MODULES_LIBS@
CPPFLAGS = @MODULES_CPPFLAGS@
AM_CPPFLAGS = @MODULES_CPPFLAGS@

pkgdata_DATA = AnyPy.py

Expand Down
2 changes: 1 addition & 1 deletion modules/apr/Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
pkgdatadir = @ZORP_PYTHON_DIR@
pkglibdir = @libdir@/zorp
LIBS = @MODULES_LIBS@
CPPFLAGS = @MODULES_CPPFLAGS@
AM_CPPFLAGS = @MODULES_CPPFLAGS@

pkgdata_DATA = APR.py

Expand Down
2 changes: 1 addition & 1 deletion modules/finger/Makefile.am
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
pkgdatadir = @ZORP_PYTHON_DIR@
pkglibdir = @libdir@/zorp
LIBS = @MODULES_LIBS@
CPPFLAGS = @MODULES_CPPFLAGS@
AM_CPPFLAGS = @MODULES_CPPFLAGS@

pkgdata_DATA = Finger.py

Expand Down
2 changes: 1 addition & 1 deletion modules/ftp/Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ SUBDIRS = tests
pkgdatadir = @ZORP_PYTHON_DIR@
pkglibdir = @libdir@/zorp
LIBS = @MODULES_LIBS@
CPPFLAGS = @MODULES_CPPFLAGS@
AM_CPPFLAGS = @MODULES_CPPFLAGS@

pkgdata_DATA = Ftp.py

Expand Down
2 changes: 1 addition & 1 deletion modules/http/Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ DIST_SUBDIRS += . messages tests
pkgdatadir = @ZORP_PYTHON_DIR@
pkglibdir = @libdir@/zorp
LIBS = @MODULES_LIBS@
CPPFLAGS = @MODULES_CPPFLAGS@
AM_CPPFLAGS = @MODULES_CPPFLAGS@
AM_CFLAGS = @CFLAGS@ -W

pkgdata_DATA = Http.py
Expand Down
2 changes: 1 addition & 1 deletion modules/http/tests/Makefile.am
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
LIBS=@MODULETESTS_LIBS@
CPPFLAGS = @MODULES_CPPFLAGS@ -DBOOST_TEST_DYN_LINK=1
AM_CPPFLAGS = @MODULES_CPPFLAGS@ -DBOOST_TEST_DYN_LINK=1

check_PROGRAMS = http_parse_url http_canon_url

Expand Down
2 changes: 1 addition & 1 deletion modules/plug/Makefile.am
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
pkgdatadir = @ZORP_PYTHON_DIR@
pkglibdir = @libdir@/zorp
LIBS = @MODULES_LIBS@
CPPFLAGS = @MODULES_CPPFLAGS@
AM_CPPFLAGS = @MODULES_CPPFLAGS@

pkgdata_DATA = Plug.py

Expand Down
2 changes: 1 addition & 1 deletion modules/pop3/Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ SUBDIRS = messages
pkgdatadir = @ZORP_PYTHON_DIR@
pkglibdir = @libdir@/zorp
LIBS = @MODULES_LIBS@
CPPFLAGS = @MODULES_CPPFLAGS@
AM_CPPFLAGS = @MODULES_CPPFLAGS@

pkgdata_DATA = Pop3.py

Expand Down
2 changes: 1 addition & 1 deletion modules/smtp/Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ SUBDIRS = . tests
pkgdatadir = @ZORP_PYTHON_DIR@
pkglibdir = @libdir@/zorp
LIBS = @MODULES_LIBS@
CPPFLAGS = @MODULES_CPPFLAGS@
AM_CPPFLAGS = @MODULES_CPPFLAGS@

pkgdata_DATA = Smtp.py

Expand Down
2 changes: 1 addition & 1 deletion modules/smtp/tests/Makefile.am
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
LIBS = @MODULETESTS_LIBS@ @DEPS_LIBS@
LDADD = ../libsmtp.la -lboost_unit_test_framework
CPPFLAGS = @MODULES_CPPFLAGS@ -DBOOST_TEST_DYN_LINK=1
AM_CPPFLAGS = @MODULES_CPPFLAGS@ -DBOOST_TEST_DYN_LINK=1

AM_DEFAULT_SOURCE_EXT = .cc

Expand Down
2 changes: 1 addition & 1 deletion modules/telnet/Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ pkgdatadir = @ZORP_PYTHON_DIR@
pkglibdir = @libdir@/zorp

LIBS = @MODULES_LIBS@
CPPFLAGS = @MODULES_CPPFLAGS@
AM_CPPFLAGS = @MODULES_CPPFLAGS@


pkgdata_DATA = Telnet.py
Expand Down
3 changes: 1 addition & 2 deletions modules/telnet/tests/Makefile.am
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
LIBS = @MODULES_LIBS@
LDADD = ../libtelnet.la -lboost_unit_test_framework
CPPFLAGS = @MODULES_CPPFLAGS@ -DBOOST_TEST_DYN_LINK=1
AM_CPPFLAGS = @MODULES_CPPFLAGS@ -DBOOST_TEST_DYN_LINK=1

check_PROGRAMS = test_telnet
check_SCRIPTS =
Expand All @@ -12,7 +12,6 @@ TESTS = $(check_PROGRAMS) $(check_SCRIPTS)
TEST_EXTENSIONS = .py
PY_LOG_COMPILER = $(PYTHON)

CPPFLAGS = @MODULES_CPPFLAGS@ -DBOOST_TEST_DYN_LINK=1
test_telnet_LDADD = ../libtelnet.la @ZORP_LIBS@ -lboost_unit_test_framework

EXTRA_DIST = $(check_SCRIPTS)
2 changes: 1 addition & 1 deletion modules/whois/Makefile.am
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
pkgdatadir = @ZORP_PYTHON_DIR@
pkglibdir = @libdir@/zorp
LIBS = @MODULES_LIBS@
CPPFLAGS = @MODULES_CPPFLAGS@
AM_CPPFLAGS = @MODULES_CPPFLAGS@

pkgdata_DATA = Whois.py

Expand Down
2 changes: 1 addition & 1 deletion tests/unit/Makefile.am
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
LIBS = @ZORP_LIBS@ @MODULES_LIBS@ @DEPS_LIBS@
LDADD = -lboost_unit_test_framework
CPPFLAGS = @MODULES_CPPFLAGS@ -DBOOST_TEST_DYN_LINK=1
AM_CPPFLAGS = @MODULES_CPPFLAGS@ -DBOOST_TEST_DYN_LINK=1

check_PROGRAMS = test_pystruct test_szig test_proxy

Expand Down