diff --git a/src/common/Makefile.am b/src/common/Makefile.am index 244f21f53..5833b9ba1 100644 --- a/src/common/Makefile.am +++ b/src/common/Makefile.am @@ -20,6 +20,7 @@ lib_LTLIBRARIES += liblumieracommon.la liblumieracommon_la_CPPFLAGS = $(AM_CPPFLAGS) -DLUMIERA_CONFIG_PATH="\"$(pkgdatadir)/config\"" -DLUMIERA_PLUGIN_PATH="\"$(pkglibdir)/\"" liblumieracommon_la_CFLAGS = $(AM_CFLAGS) -std=gnu99 -Wextra -Wall -Werror +liblumieracommon_la_CXXFLAGS = $(AM_CXXFLAGS) -Wextra -Wall liblumieracommon_la_LIBADD = liblumiera.la liblumieracommon_la_SOURCES = \ diff --git a/src/gui/Makefile.am b/src/gui/Makefile.am index fed36ad88..fb73e3d29 100644 --- a/src/gui/Makefile.am +++ b/src/gui/Makefile.am @@ -28,6 +28,9 @@ lumigui_CPPFLAGS = $(AM_CPPFLAGS) \ -DPACKAGE_DATA_DIR=\""$(datadir)"\" \ $(LUMIERA_GUI_CFLAGS) +lumigui_CFLAGS = $(AM_CFLAGS) -std=gnu99 -Wall -Wextra -Werror +lumigui_CXXFLAGS = $(AM_CXXFLAGS) -Wall -Wextra + lumigui_LDADD = \ liblumieracommon.la \ liblumierabackend.la \ @@ -56,7 +59,9 @@ lumigui_DEPENDENCIES = \ pkglib_LTLIBRARIES += gtk_gui.la -gtk_gui_la_CPPFLAGS = $(AM_CPPFLAGS) -Wall -Werror -DLUMIERA_PLUGIN -I$(top_srcdir)/src/ +gtk_gui_la_CFLAGS = $(AM_CFLAGS) -std=gnu99 -Wall -Wextra -Werror +gtk_gui_la_CXXFLAGS = $(AM_CXXFLAGS) -Wall -Wextra +gtk_gui_la_CPPFLAGS = $(AM_CPPFLAGS) -DLUMIERA_PLUGIN -I$(top_srcdir)/src/ gtk_gui_la_LDFLAGS = -module -avoid-version -no-undefined -rpath /dev/null -shrext .lum gtk_gui_la_LIBADD = \ @@ -76,6 +81,9 @@ gtk_gui_la_SOURCES = \ # noinst_LTLIBRARIES += libgui.la +libgui_la_CFLAGS = $(AM_CFLAGS) -std=gnu99 -Wall -Wextra -Werror +libgui_la_CXXFLAGS = $(AM_CXXFLAGS) -Wall -Wextra + libgui_la_CPPFLAGS = $(AM_CPPFLAGS) \ -DPACKAGE_LOCALE_DIR=\""$(prefix)/$(DATADIRNAME)/locale"\" \ -DPACKAGE_SRC_DIR=\""$(srcdir)"\" \ diff --git a/src/lib/Makefile.am b/src/lib/Makefile.am index e603e2ce4..4608feedb 100644 --- a/src/lib/Makefile.am +++ b/src/lib/Makefile.am @@ -18,7 +18,8 @@ liblumiera_la_srcdir = $(top_srcdir)/src/lib lib_LTLIBRARIES += liblumiera.la -liblumiera_la_CFLAGS = $(CFLAGS) -std=gnu99 -Wall -Werror +liblumiera_la_CFLAGS = $(AM_CFLAGS) -std=gnu99 -Wall -Wextra -Werror +liblumiera_la_CXXFLAGS = $(AM_CXXFLAGS) -Wall -Wextra liblumiera_la_SOURCES = \ $(liblumiera_la_srcdir)/error.c \ diff --git a/src/lumiera/Makefile.am b/src/lumiera/Makefile.am index 62a9b00df..4a5488971 100644 --- a/src/lumiera/Makefile.am +++ b/src/lumiera/Makefile.am @@ -19,7 +19,8 @@ lumiera_srcdir = $(top_srcdir)/src/lumiera bin_PROGRAMS += lumiera lumiera_CPPFLAGS = $(AM_CPPFLAGS) -lumiera_CFLAGS = $(AM_CFLAGS) -std=gnu99 -Wextra -Wall -Werror +lumiera_CFLAGS = $(AM_CFLAGS) -std=gnu99 -Wall -Wextra -Werror +lumiera_CXXFLAGS = $(AM_CXXFLAGS) -Wall -Wextra lumiera_LDADD = \ liblumieracommon.la \ diff --git a/src/proc/Makefile.am b/src/proc/Makefile.am index 464da33d9..c0058adfa 100644 --- a/src/proc/Makefile.am +++ b/src/proc/Makefile.am @@ -21,7 +21,8 @@ liblumiproc_la_srcdir = $(top_srcdir)/src/proc noinst_LTLIBRARIES += liblumiproc.la -liblumiproc_la_CXXFLAGS = $(CXXFLAGS) -Wall +liblumiproc_la_CFLAGS = $(AM_CFLAGS) -std=gnu99 -Wall -Wextra -Werror +liblumiproc_la_CXXFLAGS = $(AM_CXXFLAGS) -Wall -Wextra liblumiproc_la_SOURCES = \ $(liblumiproc_la_srcdir)/controllerfacade.cpp \ @@ -35,13 +36,14 @@ liblumiproc_la_SOURCES = \ liblumiprocasset_la_srcdir = $(top_srcdir)/src/proc/asset noinst_LTLIBRARIES += liblumiprocasset.la -liblumiprocasset_la_CXXFLAGS = $(CXXFLAGS) -Wall +liblumiprocasset_la_CFLAGS = $(AM_CFLAGS) -std=gnu99 -Wall -Wextra -Werror +liblumiprocasset_la_CXXFLAGS = $(AM_CXXFLAGS) -Wall -Wextra liblumiprocasset_la_SOURCES = \ $(liblumiprocasset_la_srcdir)/codec.cpp \ $(liblumiprocasset_la_srcdir)/compoundmedia.cpp \ $(liblumiprocasset_la_srcdir)/dataset.cpp \ - $(liblumiprocasset_la_srcdir)/effect.cpp \ + $(liblumiprocasset_la_srcdir)/effect.cpp \ $(liblumiprocasset_la_srcdir)/preview.cpp \ $(liblumiprocasset_la_srcdir)/unknown.cpp \ $(liblumiprocasset_la_srcdir)/clip.cpp \ @@ -51,7 +53,7 @@ liblumiprocasset_la_SOURCES = \ $(liblumiprocasset_la_srcdir)/pipe.cpp \ $(liblumiprocasset_la_srcdir)/proc.cpp \ $(liblumiprocasset_la_srcdir)/procpatt.cpp \ - $(liblumiprocasset_la_srcdir)/struct.cpp \ + $(liblumiprocasset_la_srcdir)/struct.cpp \ $(liblumiprocasset_la_srcdir)/track.cpp @@ -59,33 +61,35 @@ liblumiprocasset_la_SOURCES = \ liblumiprocengine_la_srcdir = $(top_srcdir)/src/proc/engine noinst_LTLIBRARIES += liblumiprocengine.la -liblumiprocengine_la_CXXFLAGS = $(CXXFLAGS) -Wall +liblumiprocengine_la_CFLAGS = $(AM_CFLAGS) -std=gnu99 -Wall -Wextra -Werror +liblumiprocengine_la_CXXFLAGS = $(AM_CXXFLAGS) -Wall -Wextra -liblumiprocengine_la_SOURCES = \ - $(liblumiprocengine_la_srcdir)/buffhandle.cpp \ - $(liblumiprocengine_la_srcdir)/link.cpp \ - $(liblumiprocengine_la_srcdir)/mask.cpp \ - $(liblumiprocengine_la_srcdir)/nodefactory.cpp \ - $(liblumiprocengine_la_srcdir)/nodewiring.cpp \ - $(liblumiprocengine_la_srcdir)/pluginadapter.cpp \ - $(liblumiprocengine_la_srcdir)/processor.cpp \ - $(liblumiprocengine_la_srcdir)/procnode.cpp \ - $(liblumiprocengine_la_srcdir)/projector.cpp \ - $(liblumiprocengine_la_srcdir)/renderengine.cpp \ - $(liblumiprocengine_la_srcdir)/source.cpp \ - $(liblumiprocengine_la_srcdir)/stateproxy.cpp \ - $(liblumiprocengine_la_srcdir)/trafo.cpp +liblumiprocengine_la_SOURCES = \ + $(liblumiprocengine_la_srcdir)/buffhandle.cpp \ + $(liblumiprocengine_la_srcdir)/link.cpp \ + $(liblumiprocengine_la_srcdir)/mask.cpp \ + $(liblumiprocengine_la_srcdir)/nodefactory.cpp \ + $(liblumiprocengine_la_srcdir)/nodewiring.cpp \ + $(liblumiprocengine_la_srcdir)/pluginadapter.cpp \ + $(liblumiprocengine_la_srcdir)/processor.cpp \ + $(liblumiprocengine_la_srcdir)/procnode.cpp \ + $(liblumiprocengine_la_srcdir)/projector.cpp \ + $(liblumiprocengine_la_srcdir)/renderengine.cpp \ + $(liblumiprocengine_la_srcdir)/source.cpp \ + $(liblumiprocengine_la_srcdir)/stateproxy.cpp \ + $(liblumiprocengine_la_srcdir)/trafo.cpp liblumiprocmobject_la_srcdir = $(top_srcdir)/src/proc/mobject noinst_LTLIBRARIES += liblumiprocmobject.la -liblumiprocmobject_la_CXXFLAGS = $(CXXFLAGS) -Wall +liblumiprocmobject_la_CFLAGS = $(AM_CFLAGS) -std=gnu99 -Wall -Wextra -Werror +liblumiprocmobject_la_CXXFLAGS = $(AM_CXXFLAGS) -Wall -Wextra liblumiprocmobject_la_SOURCES = \ $(liblumiprocmobject_la_srcdir)/builderfacade.cpp \ - $(liblumiprocmobject_la_srcdir)/interpolator.cpp \ + $(liblumiprocmobject_la_srcdir)/interpolator.cpp \ $(liblumiprocmobject_la_srcdir)/mobject.cpp \ $(liblumiprocmobject_la_srcdir)/parameter.cpp \ $(liblumiprocmobject_la_srcdir)/paramprovider.cpp \ @@ -96,7 +100,8 @@ liblumiprocmobject_la_SOURCES = \ liblumiprocmobjectbuilder_la_srcdir = $(top_srcdir)/src/proc/mobject/builder noinst_LTLIBRARIES += liblumiprocmobjectbuilder.la -liblumiprocmobjectbuilder_la_CXXFLAGS = $(CXXFLAGS) -Wall +liblumiprocmobjectbuilder_la_CFLAGS = $(AM_CFLAGS) -std=gnu99 -Wall -Wextra -Werror +liblumiprocmobjectbuilder_la_CXXFLAGS = $(AM_CXXFLAGS) -Wall -Wextra liblumiprocmobjectbuilder_la_SOURCES = \ $(liblumiprocmobjectbuilder_la_srcdir)/assembler.cpp \ @@ -109,17 +114,19 @@ liblumiprocmobjectbuilder_la_SOURCES = \ liblumiproccontrol_la_srcdir = $(top_srcdir)/src/proc/control noinst_LTLIBRARIES += liblumiproccontrol.la -liblumiproccontrol_la_CXXFLAGS = $(CXXFLAGS) -Wall +liblumiproccontrol_la_CFLAGS = $(AM_CFLAGS) -std=gnu99 -Wall -Wextra -Werror +liblumiproccontrol_la_CXXFLAGS = $(AM_CXXFLAGS) -Wall -Wextra -liblumiproccontrol_la_SOURCES = \ - $(liblumiproccontrol_la_srcdir)/pathmanager.cpp \ +liblumiproccontrol_la_SOURCES = \ + $(liblumiproccontrol_la_srcdir)/pathmanager.cpp \ $(liblumiproccontrol_la_srcdir)/stypemanager.cpp liblumiprocmobjectsession_la_srcdir = $(top_srcdir)/src/proc/mobject/session noinst_LTLIBRARIES += liblumiprocmobjectsession.la -liblumiprocmobjectsession_la_CXXFLAGS = $(CXXFLAGS) -Wall +liblumiprocmobjectsession_la_CFLAGS = $(AM_CFLAGS) -std=gnu99 -Wall -Wextra -Werror +liblumiprocmobjectsession_la_CXXFLAGS = $(AM_CXXFLAGS) -Wall -Wextra liblumiprocmobjectsession_la_SOURCES = \ $(liblumiprocmobjectsession_la_srcdir)/abstractmo.cpp \ @@ -130,8 +137,8 @@ liblumiprocmobjectsession_la_SOURCES = \ $(liblumiprocmobjectsession_la_srcdir)/constraint.cpp \ $(liblumiprocmobjectsession_la_srcdir)/defsmanager.cpp \ $(liblumiprocmobjectsession_la_srcdir)/effect.cpp \ - $(liblumiprocmobjectsession_la_srcdir)/fixedlocation.cpp \ - $(liblumiprocmobjectsession_la_srcdir)/label.cpp \ + $(liblumiprocmobjectsession_la_srcdir)/fixedlocation.cpp \ + $(liblumiprocmobjectsession_la_srcdir)/label.cpp \ $(liblumiprocmobjectsession_la_srcdir)/meta.cpp \ $(liblumiprocmobjectsession_la_srcdir)/relativelocation.cpp \ $(liblumiprocmobjectsession_la_srcdir)/segment.cpp \ @@ -141,7 +148,7 @@ liblumiprocmobjectsession_la_SOURCES = \ $(liblumiprocmobjectsession_la_srcdir)/sessmanagerimpl.cpp \ $(liblumiprocmobjectsession_la_srcdir)/edl.cpp \ $(liblumiprocmobjectsession_la_srcdir)/session.cpp \ - $(liblumiprocmobjectsession_la_srcdir)/track.cpp \ + $(liblumiprocmobjectsession_la_srcdir)/track.cpp \ $(liblumiprocmobjectsession_la_srcdir)/fixture.cpp \ $(liblumiprocmobjectsession_la_srcdir)/locatingpin.cpp \ $(liblumiprocmobjectsession_la_srcdir)/mobjectfactory.cpp \ @@ -153,39 +160,39 @@ liblumiprocmobjectsession_la_SOURCES = \ noinst_HEADERS += \ $(liblumiproc_la_srcdir)/asset/category.hpp \ $(liblumiproc_la_srcdir)/asset/clip.hpp \ - $(liblumiproc_la_srcdir)/asset/codec.hpp \ - $(liblumiproc_la_srcdir)/asset/compoundmedia.hpp \ + $(liblumiproc_la_srcdir)/asset/codec.hpp \ + $(liblumiproc_la_srcdir)/asset/compoundmedia.hpp \ $(liblumiproc_la_srcdir)/asset/dataset.hpp \ $(liblumiproc_la_srcdir)/asset/effect.hpp \ $(liblumiproc_la_srcdir)/asset/preview.hpp \ $(liblumiproc_la_srcdir)/asset/db.hpp \ - $(liblumiproc_la_srcdir)/asset/buildinstruct.hpp \ - $(liblumiproc_la_srcdir)/asset/media.hpp \ + $(liblumiproc_la_srcdir)/asset/buildinstruct.hpp \ + $(liblumiproc_la_srcdir)/asset/media.hpp \ $(liblumiproc_la_srcdir)/asset/meta.hpp \ $(liblumiproc_la_srcdir)/asset/pipe.hpp \ $(liblumiproc_la_srcdir)/asset/proc.hpp \ $(liblumiproc_la_srcdir)/asset/procpatt.hpp \ $(liblumiproc_la_srcdir)/asset/struct.hpp \ $(liblumiproc_la_srcdir)/asset/structfactoryimpl.hpp \ - $(liblumiproc_la_srcdir)/asset/track.hpp \ + $(liblumiproc_la_srcdir)/asset/track.hpp \ $(liblumiproc_la_srcdir)/asset/unknown.hpp \ $(liblumiproc_la_srcdir)/controllerfacade.hpp \ - $(liblumiproc_la_srcdir)/engine/mask.hpp \ + $(liblumiproc_la_srcdir)/engine/mask.hpp \ $(liblumiproc_la_srcdir)/engine/pluginadapter.hpp \ $(liblumiproc_la_srcdir)/engine/procnode.hpp \ $(liblumiproc_la_srcdir)/engine/projector.hpp \ - $(liblumiproc_la_srcdir)/engine/renderengine.hpp \ + $(liblumiproc_la_srcdir)/engine/renderengine.hpp \ $(liblumiproc_la_srcdir)/engine/source.hpp \ $(liblumiproc_la_srcdir)/engine/trafo.hpp \ $(liblumiproc_la_srcdir)/engine/processor.hpp \ $(liblumiproc_la_srcdir)/mobject/builder/assembler.hpp \ - $(liblumiproc_la_srcdir)/mobject/builder/buildertool.hpp \ + $(liblumiproc_la_srcdir)/mobject/builder/buildertool.hpp \ $(liblumiproc_la_srcdir)/mobject/builder/conmanager.hpp \ $(liblumiproc_la_srcdir)/mobject/builder/segmentationtool.hpp \ - $(liblumiproc_la_srcdir)/mobject/builder/toolfactory.hpp \ + $(liblumiproc_la_srcdir)/mobject/builder/toolfactory.hpp \ $(liblumiproc_la_srcdir)/mobject/builderfacade.hpp \ - $(liblumiproc_la_srcdir)/control/pathmanager.hpp \ - $(liblumiproc_la_srcdir)/control/renderstate.hpp \ + $(liblumiproc_la_srcdir)/control/pathmanager.hpp \ + $(liblumiproc_la_srcdir)/control/renderstate.hpp \ $(liblumiproc_la_srcdir)/mobject/interpolator.hpp \ $(liblumiproc_la_srcdir)/mobject/parameter.hpp \ $(liblumiproc_la_srcdir)/mobject/paramprovider.hpp \ @@ -205,12 +212,12 @@ noinst_HEADERS += \ $(liblumiproc_la_srcdir)/mobject/session/wish.hpp \ $(liblumiproc_la_srcdir)/mobject/session/clip.hpp \ $(liblumiproc_la_srcdir)/mobject/session/constraint.hpp \ - $(liblumiproc_la_srcdir)/mobject/session/defsmanager.hpp \ - $(liblumiproc_la_srcdir)/mobject/session/edl.hpp \ + $(liblumiproc_la_srcdir)/mobject/session/defsmanager.hpp \ + $(liblumiproc_la_srcdir)/mobject/session/edl.hpp \ $(liblumiproc_la_srcdir)/mobject/session/fixture.hpp \ - $(liblumiproc_la_srcdir)/mobject/session/locatingpin.hpp \ + $(liblumiproc_la_srcdir)/mobject/session/locatingpin.hpp \ $(liblumiproc_la_srcdir)/mobject/session/plug.hpp \ - $(liblumiproc_la_srcdir)/mobject/session/sessionimpl.hpp \ + $(liblumiproc_la_srcdir)/mobject/session/sessionimpl.hpp \ $(liblumiproc_la_srcdir)/mobject/session/defsregistry.hpp \ $(liblumiproc_la_srcdir)/mobject/explicitplacement.hpp \ $(liblumiproc_la_srcdir)/mobject/mobject.hpp \ @@ -224,7 +231,8 @@ noinst_HEADERS += \ liblumieraproc_la_srcdir = $(top_srcdir)/src/proc lib_LTLIBRARIES += liblumieraproc.la -liblumieraproc_la_CXXFLAGS = $(CXXFLAGS) -Wall +liblumieraproc_la_CFLAGS = $(AM_CFLAGS) -std=gnu99 -Wall -Wextra -Werror +liblumieraproc_la_CXXFLAGS = $(AM_CXXFLAGS) -Wall -Wextra liblumieraproc_la_SOURCES = diff --git a/src/tool/Makefile.am b/src/tool/Makefile.am index 527964593..64f8fa182 100644 --- a/src/tool/Makefile.am +++ b/src/tool/Makefile.am @@ -20,7 +20,7 @@ lumitool_srcdir = $(top_srcdir)/src/tool noinst_PROGRAMS += luidgen luidgen_CFLAGS = $(CFLAGS) -std=gnu99 -Wall -Werror -luidgen_CPPFLAGS = -I$(top_srcdir)/src/ +luidgen_CPPFLAGS = -I$(top_srcdir)/src/ luidgen_SOURCES = \ $(lumitool_srcdir)/luidgen.c