Skip to content

CFE-3629: Unset C/CPP-flags to avoid repetition in compiler-flags #6176

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.

Sign up for GitHub

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

Draft
SimonThalvorsen wants to merge 1 commit into
base: master
Choose a base branch
from
Draft

CFE-3629: Unset C/CPP-flags to avoid repetition in compiler-flags #6176

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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: 0 additions & 2 deletions cf-agent/Makefile.am
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,6 @@ AM_CPPFLAGS = -I$(srcdir)/../libpromises -I$(srcdir)/../libntech/libutils \
-I$(srcdir)/../libcfecompat \
-I$(srcdir)/../libcfnet \
-I$(srcdir)/../cf-check \
@CPPFLAGS@ \
$(ENTERPRISE_CPPFLAGS) \
$(OPENSSL_CPPFLAGS) \
$(PCRE2_CPPFLAGS) \
Expand All @@ -38,7 +37,6 @@ AM_CPPFLAGS = -I$(srcdir)/../libpromises -I$(srcdir)/../libntech/libutils \
$(PAM_CPPFLAGS)

AM_CFLAGS = \
@CFLAGS@ \
$(ENTERPRISE_CFLAGS) \
$(OPENSSL_CFLAGS) \
$(PCRE2_CFLAGS) \
Expand Down
2 changes: 0 additions & 2 deletions cf-check/Makefile.am
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,14 +26,12 @@ noinst_LTLIBRARIES = libcf-check.la
AM_CPPFLAGS = -I$(srcdir)/../libntech/libutils \
-I$(srcdir)/../libntech/libcompat \
-I$(srcdir)/../libcfecompat \
@CPPFLAGS@ \
$(PCRE2_CPPFLAGS) \
$(LIBYAML_CPPFLAGS) \
$(LMDB_CPPFLAGS) \
$(OPENSSL_CPPFLAGS)

AM_CFLAGS = \
@CFLAGS@ \
$(LMDB_CFLAGS) \
$(PCRE2_CFLAGS) \
$(LIBYAML_CFLAGS) \
Expand Down
2 changes: 1 addition & 1 deletion cf-monitord/Makefile.am
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ AM_CPPFLAGS = \
$(OPENSSL_CPPFLAGS) \
$(ENTERPRISE_CPPFLAGS)

AM_CFLAGS = @CFLAGS@ \
AM_CFLAGS = \
$(OPENSSL_CFLAGS) \
$(ENTERPRISE_CFLAGS)

Expand Down
2 changes: 1 addition & 1 deletion cf-net/Makefile.am
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ AM_CPPFLAGS = -I$(srcdir)/../libpromises -I$(srcdir)/../libntech/libutils \
$(PCRE2_CPPFLAGS) \
$(ENTERPRISE_CPPFLAGS)

AM_CFLAGS = @CFLAGS@ \
AM_CFLAGS = \
$(OPENSSL_CFLAGS) \
$(ENTERPRISE_CFLAGS)

Expand Down
3 changes: 1 addition & 2 deletions cf-promises/Makefile.am
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,12 +28,11 @@ AM_CPPFLAGS = \
-I$(srcdir)/../libpromises \
-I$(srcdir)/../libcfecompat \
-I$(srcdir)/../libcfnet \
@CPPFLAGS@ \
$(OPENSSL_CPPFLAGS) \
$(PCRE2_CPPFLAGS) \
$(ENTERPRISE_CPPFLAGS)

AM_CFLAGS = @CFLAGS@ \
AM_CFLAGS = \
$(OPENSSL_CFLAGS) \
$(ENTERPRISE_CFLAGS)

Expand Down
2 changes: 1 addition & 1 deletion cf-runagent/Makefile.am
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ AM_CPPFLAGS = -I$(srcdir)/../libpromises -I$(srcdir)/../libntech/libutils \
$(PCRE2_CPPFLAGS) \
$(ENTERPRISE_CPPFLAGS)

AM_CFLAGS = @CFLAGS@ \
AM_CFLAGS = \
$(OPENSSL_CFLAGS) \
$(ENTERPRISE_CFLAGS)

Expand Down
2 changes: 1 addition & 1 deletion cf-secret/Makefile.am
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ AM_CPPFLAGS = -I$(srcdir)/../libpromises -I$(srcdir)/../libntech/libutils \
$(PCRE2_CPPFLAGS) \
$(ENTERPRISE_CPPFLAGS)

AM_CFLAGS = @CFLAGS@ \
AM_CFLAGS = \
$(OPENSSL_CFLAGS) \
$(ENTERPRISE_CFLAGS)

Expand Down
6 changes: 4 additions & 2 deletions configure.ac
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,6 +119,8 @@ dnl ######################################################################
dnl Checks for programs.
dnl ######################################################################

: ${CFLAGS=""}
: ${CPPFLAGS=""}
AC_PROG_CC
AC_PROG_MKDIR_P
AC_EXEEXT
Expand Down Expand Up @@ -1397,8 +1399,8 @@ dnl ######################################################################
dnl Collect all the options
dnl ######################################################################

CORE_CPPFLAGS="$LMDB_CPPFLAGS $TOKYOCABINET_CPPFLAGS $QDBM_CPPFLAGS $PCRE2_CPPFLAGS $OPENSSL_CPPFLAGS $SQLITE3_CPPFLAGS $LIBACL_CPPFLAGS $LIBCURL_CPPFLAGS $LIBRSYNC_CPPFLAGS $LIBYAML_CPPFLAGS $POSTGRESQL_CPPFLAGS $MYSQL_CPPFLAGS $LIBXML2_CPPFLAGS $CPPFLAGS $CFECOMPAT_CPPFLAGS"
CORE_CFLAGS="$LMDB_CFLAGS $TOKYOCABINET_CFLAGS $QDBM_CFLAGS $PCRE2_CFLAGS $OPENSSL_CFLAGS $SQLITE3_CFLAGS $LIBACL_CFLAGS $LIBCURL_CFLAGS $LIBRSYNC_CFLAGS $LIBYAML_CFLAGS $POSTGRESQL_CFLAGS $MYSQL_CFLAGS $LIBXML2_CFLAGS $CFLAGS"
CORE_CPPFLAGS="$LMDB_CPPFLAGS $TOKYOCABINET_CPPFLAGS $QDBM_CPPFLAGS $PCRE2_CPPFLAGS $OPENSSL_CPPFLAGS $SQLITE3_CPPFLAGS $LIBACL_CPPFLAGS $LIBCURL_CPPFLAGS $LIBRSYNC_CPPFLAGS $LIBYAML_CPPFLAGS $POSTGRESQL_CPPFLAGS $MYSQL_CPPFLAGS $LIBXML2_CPPFLAGS $CFECOMPAT_CPPFLAGS"
CORE_CFLAGS="$LMDB_CFLAGS $TOKYOCABINET_CFLAGS $QDBM_CFLAGS $PCRE2_CFLAGS $OPENSSL_CFLAGS $SQLITE3_CFLAGS $LIBACL_CFLAGS $LIBCURL_CFLAGS $LIBRSYNC_CFLAGS $LIBYAML_CFLAGS $POSTGRESQL_CFLAGS $MYSQL_CFLAGS $LIBXML2_CFLAGS"
CORE_LDFLAGS="$LMDB_LDFLAGS $TOKYOCABINET_LDFLAGS $QDBM_LDFLAGS $PCRE2_LDFLAGS $OPENSSL_LDFLAGS $SQLITE3_LDFLAGS $LIBACL_LDFLAGS $LIBCURL_LDFLAGS $LIBRSYNC_LDFLAGS $LIBYAML_LDFLAGS $POSTGRESQL_LDFLAGS $MYSQL_LDFLAGS $LIBXML2_LDFLAGS $LDFLAGS"
CORE_LIBS="$LMDB_LIBS $TOKYOCABINET_LIBS $QDBM_LIBS $PCRE2_LIBS $OPENSSL_LIBS $SQLITE3_LIBS $LIBACL_LIBS $LIBCURL_LIBS $LIBRSYNC_LIBS $LIBYAML_LIBS $POSTGRESQL_LIBS $MYSQL_LIBS $LIBXML2_LIBS $LIBS"

Expand Down
Loading