Skip to content

Honor the value of CPPFLAGS set in the environment #1910

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

Open
rlaboiss wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Honor the value of CPPFLAGS set in the environment #1910

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
1609586
Honor the value of CPPFLAGS set in the environment
rlaboiss Nov 4, 2021
6243cce
Merge branch 'master' into honor-cppflags
rlaboiss Aug 23, 2022
831bdcf
foned/Makefile: Honor CPPFLAGS
rlaboiss Aug 23, 2022
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: 1 addition & 1 deletion EEG/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand Down
2 changes: 1 addition & 1 deletion FFNet/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand Down
2 changes: 1 addition & 1 deletion LPC/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand Down
2 changes: 1 addition & 1 deletion artsynth/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand Down
2 changes: 1 addition & 1 deletion dwsys/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion dwtools/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand Down
2 changes: 1 addition & 1 deletion external/clapack/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

include ../../makefile.defs

CPPFLAGS = -I ../../melder
CPPFLAGS += -I ../../melder

OBJECTS = blas.o \
lapack.o lapack_dg.o lapack_dlaq.o \
Expand Down
2 changes: 1 addition & 1 deletion external/espeak/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand Down
2 changes: 1 addition & 1 deletion external/mp3/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

include ../../makefile.defs

CPPFLAGS = -I ../../melder
CPPFLAGS += -I ../../melder

OBJECTS = mp3.o \
mad_bit.o \
Expand Down
2 changes: 1 addition & 1 deletion external/opusfile/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion external/vorbis/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand Down
2 changes: 1 addition & 1 deletion fon/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand Down
2 changes: 1 addition & 1 deletion foned/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand Down
2 changes: 1 addition & 1 deletion gram/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand Down
2 changes: 1 addition & 1 deletion kar/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ include ../makefile.defs

OBJECTS = ipaSerifRegularPS.o longchar.o

CPPFLAGS = -I ../melder
CPPFLAGS += -I ../melder

.PHONY: all clean

Expand Down
2 changes: 1 addition & 1 deletion main/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion melder/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand Down
2 changes: 1 addition & 1 deletion stat/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand Down
2 changes: 1 addition & 1 deletion sys/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand Down