MirrorHub
/
construct
mirror of https://github.com/matrix-construct/construct
0
0
Fork 0
Code Issues Releases Wiki Activity

Ensure EXTRA_*FLAGS is properly appended after other build flags.

This commit is contained in:
Jason Volk 2023-01-16 12:22:24 -08:00
parent 336f740036
commit 6bbde81b44
5 changed files with 21 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Makefile.am
View File

@ -1,7 +1,8 @@
AUTOMAKE_OPTIONS = foreign AUTOMAKE_OPTIONS = foreign
ACLOCAL_AMFLAGS = -I tools/m4 ACLOCAL_AMFLAGS = -I tools/m4
SUBDIRS = include/ircd SUBDIRS =#
SUBDIRS += include/ircd
SUBDIRS += ircd SUBDIRS += ircd
SUBDIRS += matrix SUBDIRS += matrix
SUBDIRS += modules SUBDIRS += modules

4
include/ircd/Makefile.am
View File

@ -16,8 +16,8 @@ LOWMEM_FLAGS= --param ggc-min-expand=1
endif endif
endif endif
AM_CPPFLAGS += $(EXTRA_CPPFLAGS) CPPFLAGS += $(EXTRA_CPPFLAGS)
AM_CXXFLAGS += $(EXTRA_CXXFLAGS) CXXFLAGS += $(EXTRA_CXXFLAGS)
# includedir = @includedir@/$(PACKAGE_TARNAME) # includedir = @includedir@/$(PACKAGE_TARNAME)
includedir = @includedir@/ircd includedir = @includedir@/ircd

10
ircd/Makefile.am
View File

@ -68,9 +68,13 @@ AM_LDFLAGS += -Wl,--enable-runtime-pseudo-reloc
AM_LDFLAGS += -export-symbols-regex '*' AM_LDFLAGS += -export-symbols-regex '*'
endif endif
AM_CXXFLAGS += $(EXTRA_CXXFLAGS) CXXFLAGS += $(EXTRA_CXXFLAGS)
AM_CPPFLAGS += $(EXTRA_CPPFLAGS) CPPFLAGS += $(EXTRA_CPPFLAGS)
AM_LDFLAGS += $(EXTRA_LDFLAGS) LDFLAGS += $(EXTRA_LDFLAGS)
#
# libircd
#
libircddir = @libdir@ libircddir = @libdir@
libircd_LTLIBRARIES =# libircd_LTLIBRARIES =#

14
matrix/Makefile.am
View File

@ -58,18 +58,18 @@ if MINGW
AM_LDFLAGS += -Wl,--enable-runtime-pseudo-reloc AM_LDFLAGS += -Wl,--enable-runtime-pseudo-reloc
endif endif
AM_CXXFLAGS += $(EXTRA_CXXFLAGS) CXXFLAGS += $(EXTRA_CXXFLAGS)
AM_CPPFLAGS += $(EXTRA_CPPFLAGS) CPPFLAGS += $(EXTRA_CPPFLAGS)
AM_LDFLAGS += $(EXTRA_LDFLAGS) LDFLAGS += $(EXTRA_LDFLAGS)
#
# libircd_matrix
#
libircd_matrixdir = @libdir@ libircd_matrixdir = @libdir@
libircd_matrix_LTLIBRARIES =# libircd_matrix_LTLIBRARIES =#
libircd_matrix_LTLIBRARIES += libircd_matrix.la libircd_matrix_LTLIBRARIES += libircd_matrix.la
#
# Unit list
#
libircd_matrix_la_SOURCES =# libircd_matrix_la_SOURCES =#
libircd_matrix_la_SOURCES += name.cc libircd_matrix_la_SOURCES += name.cc
libircd_matrix_la_SOURCES += id.cc libircd_matrix_la_SOURCES += id.cc

6
modules/Makefile.am
View File

@ -32,9 +32,9 @@ AM_LDFLAGS += -Wl,--no-gnu-unique
AM_LDFLAGS += -Wl,--sort-common=descending AM_LDFLAGS += -Wl,--sort-common=descending
endif endif
AM_CXXFLAGS += $(EXTRA_CXXFLAGS) CPPFLAGS += $(EXTRA_CPPFLAGS)
AM_CPPFLAGS += $(EXTRA_CPPFLAGS) CXXFLAGS += $(EXTRA_CXXFLAGS)
AM_LDFLAGS += $(EXTRA_LDFLAGS) LDFLAGS += $(EXTRA_LDFLAGS)
############################################################################### ###############################################################################
# #