From 16095862ce9e387dcfc2d24892d505de84a95125 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rafael=20Laboissi=C3=A8re?= Date: Thu, 4 Nov 2021 14:09:44 +0100 Subject: [PATCH 1/2] Honor the value of CPPFLAGS set in the environment --- EEG/Makefile | 2 +- FFNet/Makefile | 2 +- LPC/Makefile | 2 +- artsynth/Makefile | 2 +- dwsys/Makefile | 2 +- dwtools/Makefile | 2 +- external/clapack/Makefile | 2 +- external/espeak/Makefile | 2 +- external/mp3/Makefile | 2 +- external/opusfile/Makefile | 2 +- external/vorbis/Makefile | 2 +- fon/Makefile | 2 +- gram/Makefile | 2 +- kar/Makefile | 2 +- main/Makefile | 2 +- melder/Makefile | 2 +- stat/Makefile | 2 +- sys/Makefile | 2 +- 18 files changed, 18 insertions(+), 18 deletions(-) diff --git a/EEG/Makefile b/EEG/Makefile index a3662a0d1..dc4706791 100644 --- a/EEG/Makefile +++ b/EEG/Makefile @@ -3,7 +3,7 @@ include ../makefile.defs -CPPFLAGS = -I ../kar -I ../melder -I ../sys -I ../dwsys -I ../stat -I ../dwtools -I ../fon +CPPFLAGS += -I ../kar -I ../melder -I ../sys -I ../dwsys -I ../stat -I ../dwtools -I ../fon OBJECTS = EEG.o EEGWindow.o ERPTier.o ERP.o ERPWindow.o \ praat_EEG.o manual_EEG.o diff --git a/FFNet/Makefile b/FFNet/Makefile index d65da34d6..6c2786785 100644 --- a/FFNet/Makefile +++ b/FFNet/Makefile @@ -3,7 +3,7 @@ include ../makefile.defs -CPPFLAGS = -I ../kar -I ../melder -I ../sys -I ../dwtools -I ../fon -I ../dwsys -I ../stat -I ../gram +CPPFLAGS += -I ../kar -I ../melder -I ../sys -I ../dwtools -I ../fon -I ../dwsys -I ../stat -I ../gram OBJECTS = FFNet.o \ FFNet_Eigen.o FFNet_Matrix.o FFNet_PatternList.o \ diff --git a/LPC/Makefile b/LPC/Makefile index 55a7a3520..d4064f478 100644 --- a/LPC/Makefile +++ b/LPC/Makefile @@ -4,7 +4,7 @@ # -save-temps=cwd include ../makefile.defs -CPPFLAGS = -I . -I ../kar -I ../melder -I ../fon -I ../dwtools -I ../sys -I ../dwsys -I ../stat +CPPFLAGS += -I . -I ../kar -I ../melder -I ../fon -I ../dwtools -I ../sys -I ../dwsys -I ../stat OBJECTS = Cepstrum.o Cepstrumc.o Cepstrum_and_Spectrum.o \ Cepstrogram.o \ diff --git a/artsynth/Makefile b/artsynth/Makefile index b4f74f384..a7c313e21 100644 --- a/artsynth/Makefile +++ b/artsynth/Makefile @@ -3,7 +3,7 @@ include ../makefile.defs -CPPFLAGS = -I ../kar -I ../melder -I ../sys -I ../fon -I ../stat +CPPFLAGS += -I ../kar -I ../melder -I ../sys -I ../fon -I ../stat OBJECTS = Speaker.o Articulation.o Artword.o \ Art_Speaker.o Art_Speaker_to_VocalTract.o Artword_Speaker.o Artword_Speaker_Sound.o \ diff --git a/dwsys/Makefile b/dwsys/Makefile index 519d08227..1fa5b362f 100644 --- a/dwsys/Makefile +++ b/dwsys/Makefile @@ -4,7 +4,7 @@ include ../makefile.defs -CPPFLAGS = -I ../melder -I ../stat -I ../sys -I ../fon -I ../external/gsl -I ../external/clapack -I ../kar +CPPFLAGS += -I ../melder -I ../stat -I ../sys -I ../fon -I ../external/gsl -I ../external/clapack -I ../kar all: libdwsys.a diff --git a/dwtools/Makefile b/dwtools/Makefile index 69f74fe81..095fbe639 100644 --- a/dwtools/Makefile +++ b/dwtools/Makefile @@ -4,7 +4,7 @@ include ../makefile.defs -CPPFLAGS = -I . -I ../kar -I ../melder -I ../LPC -I ../fon -I ../sys -I ../stat -I ../dwsys -I ../external/portaudio -I ../external/espeak -I ../external/clapack -I ../EEG -I ../external/vorbis -I ../external/opusfile +CPPFLAGS += -I . -I ../kar -I ../melder -I ../LPC -I ../fon -I ../sys -I ../stat -I ../dwsys -I ../external/portaudio -I ../external/espeak -I ../external/clapack -I ../EEG -I ../external/vorbis -I ../external/opusfile OBJECTS = ActivationList.o AffineTransform.o AnalyticSound.o \ Categories.o CategoriesEditor.o \ diff --git a/external/clapack/Makefile b/external/clapack/Makefile index 6e1f9b157..8fcc5cb41 100644 --- a/external/clapack/Makefile +++ b/external/clapack/Makefile @@ -4,7 +4,7 @@ include ../../makefile.defs -CPPFLAGS = -I ../../melder +CPPFLAGS += -I ../../melder OBJECTS = blas.o \ lapack.o lapack_dg.o lapack_dlaq.o \ diff --git a/external/espeak/Makefile b/external/espeak/Makefile index 4646bfa08..5d61abf2b 100644 --- a/external/espeak/Makefile +++ b/external/espeak/Makefile @@ -2,7 +2,7 @@ include ../../makefile.defs -CPPFLAGS = -I ../../kar -I ../../melder -I ../../dwtools -I ../../sys -I ../../dwsys -I ../../stat +CPPFLAGS += -I ../../kar -I ../../melder -I ../../dwtools -I ../../sys -I ../../dwsys -I ../../stat OBJECTS = categories.o compiledata.o compiledict.o \ dictionary.o \ diff --git a/external/mp3/Makefile b/external/mp3/Makefile index bd294e3f7..aa2ed0bf8 100644 --- a/external/mp3/Makefile +++ b/external/mp3/Makefile @@ -4,7 +4,7 @@ include ../../makefile.defs -CPPFLAGS = -I ../../melder +CPPFLAGS += -I ../../melder OBJECTS = mp3.o \ mad_bit.o \ diff --git a/external/opusfile/Makefile b/external/opusfile/Makefile index 04f5d3fd6..2d6a2c394 100644 --- a/external/opusfile/Makefile +++ b/external/opusfile/Makefile @@ -3,7 +3,7 @@ include ../../makefile.defs -CPPFLAGS = -I ../../melder -I ../vorbis -I opus -I opus/celt -I opus/silk -I opus/silk/float +CPPFLAGS += -I ../../melder -I ../vorbis -I opus -I opus/celt -I opus/silk -I opus/silk/float OPUSFILE_OBJECTS = opusfile.o opusfile_info.o opusfile_internal.o opusfile_stream.o diff --git a/external/vorbis/Makefile b/external/vorbis/Makefile index 90c9f7036..28e42bcc2 100644 --- a/external/vorbis/Makefile +++ b/external/vorbis/Makefile @@ -3,7 +3,7 @@ include ../../makefile.defs -CPPFLAGS = -I ../../melder +CPPFLAGS += -I ../../melder OBJECTS = ogg_bitwise.o ogg_framing.o \ vorbis_block.o vorbis_bitrate.o vorbis_codebook.o vorbis_envelope.o vorbis_floor0.o \ diff --git a/fon/Makefile b/fon/Makefile index dff5b9ded..bea475918 100644 --- a/fon/Makefile +++ b/fon/Makefile @@ -3,7 +3,7 @@ include ../makefile.defs -CPPFLAGS = -I ../kar -I ../melder -I ../sys -I ../dwsys -I ../stat -I ../dwtools -I ../LPC -I ../fon -I ../external/portaudio -I ../external/flac -I ../external/mp3 -I ../external/espeak +CPPFLAGS += -I ../kar -I ../melder -I ../sys -I ../dwsys -I ../stat -I ../dwtools -I ../LPC -I ../fon -I ../external/portaudio -I ../external/flac -I ../external/mp3 -I ../external/espeak OBJECTS = Transition.o Distributions_and_Transition.o \ Function.o Sampled.o SampledXY.o Matrix.o Vector.o Polygon.o PointProcess.o \ diff --git a/gram/Makefile b/gram/Makefile index 93d115e1c..e2ec2efcb 100644 --- a/gram/Makefile +++ b/gram/Makefile @@ -3,7 +3,7 @@ include ../makefile.defs -CPPFLAGS = -I ../kar -I ../melder -I ../sys -I ../dwsys -I ../stat -I ../dwtools -I ../fon +CPPFLAGS += -I ../kar -I ../melder -I ../sys -I ../dwsys -I ../stat -I ../dwtools -I ../fon OBJECTS = Network.o \ OTGrammar.o OTGrammarEditor.o manual_gram.o praat_gram.o OTMulti.o OTMultiEditor.o \ diff --git a/kar/Makefile b/kar/Makefile index 12ab6a1ea..23878fb5b 100644 --- a/kar/Makefile +++ b/kar/Makefile @@ -5,7 +5,7 @@ include ../makefile.defs OBJECTS = ipaSerifRegularPS.o longchar.o -CPPFLAGS = -I ../melder +CPPFLAGS += -I ../melder .PHONY: all clean diff --git a/main/Makefile b/main/Makefile index 38fbd56db..6c71d918e 100644 --- a/main/Makefile +++ b/main/Makefile @@ -3,7 +3,7 @@ include ../makefile.defs -CPPFLAGS = -I ../kar -I ../melder -I ../sys -I ../fon +CPPFLAGS += -I ../kar -I ../melder -I ../sys -I ../fon .PHONY: clean diff --git a/melder/Makefile b/melder/Makefile index 555f464dc..e1c4ecb3f 100644 --- a/melder/Makefile +++ b/melder/Makefile @@ -3,7 +3,7 @@ include ../makefile.defs -CPPFLAGS = -I ../melder +CPPFLAGS += -I ../melder OBJECTS = melder.o complex.o melder_alloc.o melder_colour.o \ melder_ftoa.o melder_console.o melder_textencoding.o melder_atof.o melder_files.o \ diff --git a/stat/Makefile b/stat/Makefile index 5034e8492..7e1001b33 100644 --- a/stat/Makefile +++ b/stat/Makefile @@ -3,7 +3,7 @@ include ../makefile.defs -CPPFLAGS = -I ../kar -I ../melder -I ../sys -I ../dwsys -I ../dwtools -I ../fon -I ../stat +CPPFLAGS += -I ../kar -I ../melder -I ../sys -I ../dwsys -I ../dwtools -I ../fon -I ../stat OBJECTS = Table.o TableEditor.o Regression.o manual_statistics.o \ praat_TableOfReal.o praat_Stat.o \ diff --git a/sys/Makefile b/sys/Makefile index f7944c66a..dcb286459 100644 --- a/sys/Makefile +++ b/sys/Makefile @@ -4,7 +4,7 @@ include ../makefile.defs # -I ../sys is there because e.g. Graphics.cpp include fon/Function.h, which again includes something from sys -CPPFLAGS = -I ../melder -I ../sys -I ../dwsys +CPPFLAGS += -I ../melder -I ../sys -I ../dwsys OBJECTS = Thing.o Data.o Simple.o Collection.o Strings.o \ Graphics.o Graphics_linesAndAreas.o Graphics_text.o Graphics_colour.o \ From 831bdcfae175992b131cdf090c3491316040b243 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rafael=20Laboissi=C3=A8re?= Date: Tue, 23 Aug 2022 12:10:59 -0300 Subject: [PATCH 2/2] foned/Makefile: Honor CPPFLAGS --- foned/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/foned/Makefile b/foned/Makefile index 389d0c71a..05401e73f 100644 --- a/foned/Makefile +++ b/foned/Makefile @@ -3,7 +3,7 @@ include ../makefile.defs -CPPFLAGS = -I ../kar -I ../melder -I ../sys -I ../dwsys -I ../stat -I ../dwtools -I ../LPC -I ../fon -I ../external/portaudio -I ../external/flac -I ../external/mp3 -I ../external/espeak +CPPFLAGS += -I ../kar -I ../melder -I ../sys -I ../dwsys -I ../stat -I ../dwtools -I ../LPC -I ../fon -I ../external/portaudio -I ../external/flac -I ../external/mp3 -I ../external/espeak OBJECTS = SoundRecorder.o \ FunctionArea.o SoundArea.o SoundAnalysisArea.o TextGridArea.o \