diff --git a/EEG/Makefile b/EEG/Makefile index 7c5d79686..590908e73 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 -I ../foned +CPPFLAGS += -I ../kar -I ../melder -I ../sys -I ../dwsys -I ../stat -I ../dwtools -I ../fon -I ../foned OBJECTS = EEG.o EEGArea.o EEGAnalysisArea.o \ EEGWindow.o ERPTier.o ERP.o ERPArea.o ERPWindow.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 41856dc40..849eaa7c4 100644 --- a/LPC/Makefile +++ b/LPC/Makefile @@ -3,7 +3,7 @@ include ../makefile.defs -CPPFLAGS = -I . -I ../kar -I ../melder -I ../fon -I ../foned -I ../dwtools -I ../sys -I ../dwsys -I ../stat +CPPFLAGS += -I . -I ../kar -I ../melder -I ../fon -I ../foned -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 eaf786a30..ebe3729d2 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 ../foned -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 ../foned -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 8defe68df..731eea697 100644 --- a/external/espeak/Makefile +++ b/external/espeak/Makefile @@ -3,7 +3,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 = case.o 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 4227a8b15..d54905f4d 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 ../foned -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 ../foned -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/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 \ diff --git a/gram/Makefile b/gram/Makefile index 33816574e..d2549e8da 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 -I ../foned +CPPFLAGS += -I ../kar -I ../melder -I ../sys -I ../dwsys -I ../stat -I ../dwtools -I ../fon -I ../foned 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 89d8707d6..daf8bdf55 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 2c7a01dde..b24bffa3a 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 ../foned -I ../stat +CPPFLAGS += -I ../kar -I ../melder -I ../sys -I ../dwsys -I ../dwtools -I ../fon -I ../foned -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 ee97a0c1f..a477311e1 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 \