From 216a2b64cbdad9ef0d43c5e9ac7021daa94fc947 Mon Sep 17 00:00:00 2001 From: Jason Volk Date: Tue, 19 Jul 2022 11:36:04 -0700 Subject: [PATCH] Move -include arguments to preprocessor flags. --- ircd/Makefile.am | 6 ++++-- matrix/Makefile.am | 4 ++-- modules/Makefile.am | 4 ++-- 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/ircd/Makefile.am b/ircd/Makefile.am index 57d72b078..ebf0e0c4d 100644 --- a/ircd/Makefile.am +++ b/ircd/Makefile.am @@ -7,10 +7,10 @@ DEFS += -DIRCD_UNIT AM_CPPFLAGS =# AM_CPPFLAGS += -I$(top_srcdir)/include +AM_CPPFLAGS += -include ircd/ircd.pic.h AM_CXXFLAGS =# AM_CXXFLAGS += -ftls-model=initial-exec -AM_CXXFLAGS += -include ircd/ircd.pic.h AM_LDFLAGS =# AM_LDFLAGS += -version-info 3:2:0 @@ -371,8 +371,10 @@ GPU_CPPFLAGS =# GPU_CPPFLAGS += -D__OPENCL_VERSION__=110 GPU_CPPFLAGS += -Dcl_clang_storage_class_specifiers GPU_CPPFLAGS += -DNOFP64 -GPU_CPPFLAGS += $(AM_CPPFLAGS) +GPU_CPPFLAGS += -I$(top_srcdir)/include +GPU_CPPFLAGS += -include "ircd/config.h" GPU_CPPFLAGS += $(CPPFLAGS) +GPU_CPPFLAGS += $(CWARNS) GPU_CPPFLAGS += $(DEFS) GPU_CFLAGS =# diff --git a/matrix/Makefile.am b/matrix/Makefile.am index 2849f4465..0e5f78b5a 100644 --- a/matrix/Makefile.am +++ b/matrix/Makefile.am @@ -8,10 +8,10 @@ DEFS += -DIRCD_MATRIX_UNIT AM_CPPFLAGS =# AM_CPPFLAGS += -I$(top_srcdir)/include +AM_CPPFLAGS += -include ircd/matrix.pic.h +AM_CPPFLAGS += -include ircd/mods/mapi.h AM_CXXFLAGS =# -AM_CXXFLAGS += -include ircd/matrix.pic.h -AM_CXXFLAGS += -include ircd/mods/mapi.h AM_LDFLAGS =# AM_LDFLAGS += -version-info 0:1:0 diff --git a/modules/Makefile.am b/modules/Makefile.am index ec4398d58..7358bdc28 100644 --- a/modules/Makefile.am +++ b/modules/Makefile.am @@ -5,11 +5,11 @@ DEFS += -DIRCD_UNIT_MODULE AM_CPPFLAGS =# AM_CPPFLAGS += -I$(top_srcdir)/include +AM_CPPFLAGS += -include $(top_srcdir)/include/ircd/matrix.pic.h +AM_CPPFLAGS += -include $(top_srcdir)/include/ircd/mods/mapi.h AM_CXXFLAGS =# AM_CXXFLAGS += -ftls-model=global-dynamic -AM_CXXFLAGS += -include $(top_srcdir)/include/ircd/matrix.pic.h -AM_CXXFLAGS += -include $(top_srcdir)/include/ircd/mods/mapi.h AM_LDFLAGS =# AM_LDFLAGS += -module