benn/lumiera_
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merged in LUMIERA master and gui branches

Browse source
This commit is contained in:
Joel Holdsworth 2008-12-29 19:13:58 +00:00
parent ad957ef9e3
commit 90d14d12f7
4 changed files with 15 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/backend/Makefile.am
View file

@ -19,7 +19,7 @@ liblumierabackend_la_srcdir = $(top_srcdir)/src/backend
lib_LTLIBRARIES += liblumierabackend.la lib_LTLIBRARIES += liblumierabackend.la
liblumierabackend_la_CPPFLAGS = $(AM_CPPFLAGS) liblumierabackend_la_CPPFLAGS = $(AM_CPPFLAGS)
liblumierabackend_la_CFLAGS = $(AM_CFLAGS) -std=gnu99 -Wextra -Wall -Werror liblumierabackend_la_CFLAGS = $(AM_CFLAGS) -std=gnu99 -Wextra -Wall #-Werror
liblumierabackend_la_LIBADD = liblumiera.la liblumierabackend_la_LIBADD = liblumiera.la
liblumierabackend_la_SOURCES = \ liblumierabackend_la_SOURCES = \

8
src/gui/Makefile.am
View file

@ -84,7 +84,7 @@ gtk_gui_la_SOURCES = \
# #
noinst_LTLIBRARIES += libgui.la noinst_LTLIBRARIES += libgui.la
libgui_la_CFLAGS = $(AM_CFLAGS) -std=gnu99 -Wall -Wextra -Werror libgui_la_CFLAGS = $(AM_CFLAGS) -std=gnu99 -Wall -Wextra #-Werror
libgui_la_CXXFLAGS = $(AM_CXXFLAGS) -Wall -Wextra libgui_la_CXXFLAGS = $(AM_CXXFLAGS) -Wall -Wextra
libgui_la_CPPFLAGS = $(AM_CPPFLAGS) \ libgui_la_CPPFLAGS = $(AM_CPPFLAGS) \
@ -106,8 +106,8 @@ libgui_la_SOURCES = \
$(lumigui_srcdir)/dialogs/render.hpp \ $(lumigui_srcdir)/dialogs/render.hpp \
$(lumigui_srcdir)/dialogs/preferences-dialog.cpp \ $(lumigui_srcdir)/dialogs/preferences-dialog.cpp \
$(lumigui_srcdir)/dialogs/preferences-dialog.hpp \ $(lumigui_srcdir)/dialogs/preferences-dialog.hpp \
$(lumigui_srcdir)/dialogs/sequence-name.cpp \ $(lumigui_srcdir)/dialogs/name-chooser.cpp \
$(lumigui_srcdir)/dialogs/sequence-name.hpp \ $(lumigui_srcdir)/dialogs/name-chooser.hpp \
$(lumigui_srcdir)/panels/panel.cpp \ $(lumigui_srcdir)/panels/panel.cpp \
$(lumigui_srcdir)/panels/panel.hpp \ $(lumigui_srcdir)/panels/panel.hpp \
$(lumigui_srcdir)/panels/timeline-panel.cpp \ $(lumigui_srcdir)/panels/timeline-panel.cpp \
@ -116,6 +116,8 @@ libgui_la_SOURCES = \
$(lumigui_srcdir)/panels/viewer-panel.hpp \ $(lumigui_srcdir)/panels/viewer-panel.hpp \
$(lumigui_srcdir)/panels/assets-panel.cpp \ $(lumigui_srcdir)/panels/assets-panel.cpp \
$(lumigui_srcdir)/panels/assets-panel.hpp \ $(lumigui_srcdir)/panels/assets-panel.hpp \
$(lumigui_srcdir)/widgets/menu-button.cpp \
$(lumigui_srcdir)/widgets/menu-button.hpp \
$(lumigui_srcdir)/widgets/video-display-widget.cpp \ $(lumigui_srcdir)/widgets/video-display-widget.cpp \
$(lumigui_srcdir)/widgets/video-display-widget.hpp \ $(lumigui_srcdir)/widgets/video-display-widget.hpp \
$(lumigui_srcdir)/widgets/timeline-widget.cpp \ $(lumigui_srcdir)/widgets/timeline-widget.cpp \

2
src/lib/Makefile.am
View file

@ -18,7 +18,7 @@
liblumiera_la_srcdir = $(top_srcdir)/src/lib liblumiera_la_srcdir = $(top_srcdir)/src/lib
lib_LTLIBRARIES += liblumiera.la lib_LTLIBRARIES += liblumiera.la
liblumiera_la_CFLAGS = $(AM_CFLAGS) -std=gnu99 -Wall -Wextra -Werror liblumiera_la_CFLAGS = $(AM_CFLAGS) -std=gnu99 -Wall -Wextra #-Werror
liblumiera_la_CXXFLAGS = $(AM_CXXFLAGS) -Wall -Wextra liblumiera_la_CXXFLAGS = $(AM_CXXFLAGS) -Wall -Wextra
liblumiera_la_SOURCES = \ liblumiera_la_SOURCES = \

16
src/proc/Makefile.am
View file

@ -21,7 +21,7 @@
liblumiproc_la_srcdir = $(top_srcdir)/src/proc liblumiproc_la_srcdir = $(top_srcdir)/src/proc
noinst_LTLIBRARIES += liblumiproc.la noinst_LTLIBRARIES += liblumiproc.la
liblumiproc_la_CFLAGS = $(AM_CFLAGS) -std=gnu99 -Wall -Wextra -Werror liblumiproc_la_CFLAGS = $(AM_CFLAGS) -std=gnu99 -Wall -Wextra #-Werror
liblumiproc_la_CXXFLAGS = $(AM_CXXFLAGS) -Wall -Wextra liblumiproc_la_CXXFLAGS = $(AM_CXXFLAGS) -Wall -Wextra
liblumiproc_la_SOURCES = \ liblumiproc_la_SOURCES = \
@ -36,7 +36,7 @@ liblumiproc_la_SOURCES = \
liblumiprocasset_la_srcdir = $(top_srcdir)/src/proc/asset liblumiprocasset_la_srcdir = $(top_srcdir)/src/proc/asset
noinst_LTLIBRARIES += liblumiprocasset.la noinst_LTLIBRARIES += liblumiprocasset.la
liblumiprocasset_la_CFLAGS = $(AM_CFLAGS) -std=gnu99 -Wall -Wextra -Werror liblumiprocasset_la_CFLAGS = $(AM_CFLAGS) -std=gnu99 -Wall -Wextra #-Werror
liblumiprocasset_la_CXXFLAGS = $(AM_CXXFLAGS) -Wall -Wextra liblumiprocasset_la_CXXFLAGS = $(AM_CXXFLAGS) -Wall -Wextra
liblumiprocasset_la_SOURCES = \ liblumiprocasset_la_SOURCES = \
@ -61,7 +61,7 @@ liblumiprocasset_la_SOURCES = \
liblumiprocengine_la_srcdir = $(top_srcdir)/src/proc/engine liblumiprocengine_la_srcdir = $(top_srcdir)/src/proc/engine
noinst_LTLIBRARIES += liblumiprocengine.la noinst_LTLIBRARIES += liblumiprocengine.la
liblumiprocengine_la_CFLAGS = $(AM_CFLAGS) -std=gnu99 -Wall -Wextra -Werror liblumiprocengine_la_CFLAGS = $(AM_CFLAGS) -std=gnu99 -Wall -Wextra #-Werror
liblumiprocengine_la_CXXFLAGS = $(AM_CXXFLAGS) -Wall -Wextra liblumiprocengine_la_CXXFLAGS = $(AM_CXXFLAGS) -Wall -Wextra
liblumiprocengine_la_SOURCES = \ liblumiprocengine_la_SOURCES = \
@ -84,7 +84,7 @@ liblumiprocengine_la_SOURCES = \
liblumiprocmobject_la_srcdir = $(top_srcdir)/src/proc/mobject liblumiprocmobject_la_srcdir = $(top_srcdir)/src/proc/mobject
noinst_LTLIBRARIES += liblumiprocmobject.la noinst_LTLIBRARIES += liblumiprocmobject.la
liblumiprocmobject_la_CFLAGS = $(AM_CFLAGS) -std=gnu99 -Wall -Wextra -Werror liblumiprocmobject_la_CFLAGS = $(AM_CFLAGS) -std=gnu99 -Wall -Wextra #-Werror
liblumiprocmobject_la_CXXFLAGS = $(AM_CXXFLAGS) -Wall -Wextra liblumiprocmobject_la_CXXFLAGS = $(AM_CXXFLAGS) -Wall -Wextra
liblumiprocmobject_la_SOURCES = \ liblumiprocmobject_la_SOURCES = \
@ -100,7 +100,7 @@ liblumiprocmobject_la_SOURCES = \
liblumiprocmobjectbuilder_la_srcdir = $(top_srcdir)/src/proc/mobject/builder liblumiprocmobjectbuilder_la_srcdir = $(top_srcdir)/src/proc/mobject/builder
noinst_LTLIBRARIES += liblumiprocmobjectbuilder.la noinst_LTLIBRARIES += liblumiprocmobjectbuilder.la
liblumiprocmobjectbuilder_la_CFLAGS = $(AM_CFLAGS) -std=gnu99 -Wall -Wextra -Werror liblumiprocmobjectbuilder_la_CFLAGS = $(AM_CFLAGS) -std=gnu99 -Wall -Wextra #-Werror
liblumiprocmobjectbuilder_la_CXXFLAGS = $(AM_CXXFLAGS) -Wall -Wextra liblumiprocmobjectbuilder_la_CXXFLAGS = $(AM_CXXFLAGS) -Wall -Wextra
liblumiprocmobjectbuilder_la_SOURCES = \ liblumiprocmobjectbuilder_la_SOURCES = \
@ -114,7 +114,7 @@ liblumiprocmobjectbuilder_la_SOURCES = \
liblumiproccontrol_la_srcdir = $(top_srcdir)/src/proc/control liblumiproccontrol_la_srcdir = $(top_srcdir)/src/proc/control
noinst_LTLIBRARIES += liblumiproccontrol.la noinst_LTLIBRARIES += liblumiproccontrol.la
liblumiproccontrol_la_CFLAGS = $(AM_CFLAGS) -std=gnu99 -Wall -Wextra -Werror liblumiproccontrol_la_CFLAGS = $(AM_CFLAGS) -std=gnu99 -Wall -Wextra #-Werror
liblumiproccontrol_la_CXXFLAGS = $(AM_CXXFLAGS) -Wall -Wextra liblumiproccontrol_la_CXXFLAGS = $(AM_CXXFLAGS) -Wall -Wextra
liblumiproccontrol_la_SOURCES = \ liblumiproccontrol_la_SOURCES = \
@ -125,7 +125,7 @@ liblumiproccontrol_la_SOURCES = \
liblumiprocmobjectsession_la_srcdir = $(top_srcdir)/src/proc/mobject/session liblumiprocmobjectsession_la_srcdir = $(top_srcdir)/src/proc/mobject/session
noinst_LTLIBRARIES += liblumiprocmobjectsession.la noinst_LTLIBRARIES += liblumiprocmobjectsession.la
liblumiprocmobjectsession_la_CFLAGS = $(AM_CFLAGS) -std=gnu99 -Wall -Wextra -Werror liblumiprocmobjectsession_la_CFLAGS = $(AM_CFLAGS) -std=gnu99 -Wall -Wextra #-Werror
liblumiprocmobjectsession_la_CXXFLAGS = $(AM_CXXFLAGS) -Wall -Wextra liblumiprocmobjectsession_la_CXXFLAGS = $(AM_CXXFLAGS) -Wall -Wextra
liblumiprocmobjectsession_la_SOURCES = \ liblumiprocmobjectsession_la_SOURCES = \
@ -231,7 +231,7 @@ noinst_HEADERS += \
liblumieraproc_la_srcdir = $(top_srcdir)/src/proc liblumieraproc_la_srcdir = $(top_srcdir)/src/proc
lib_LTLIBRARIES += liblumieraproc.la lib_LTLIBRARIES += liblumieraproc.la
liblumieraproc_la_CFLAGS = $(AM_CFLAGS) -std=gnu99 -Wall -Wextra -Werror liblumieraproc_la_CFLAGS = $(AM_CFLAGS) -std=gnu99 -Wall -Wextra #-Werror
liblumieraproc_la_CXXFLAGS = $(AM_CXXFLAGS) -Wall -Wextra liblumieraproc_la_CXXFLAGS = $(AM_CXXFLAGS) -Wall -Wextra
liblumieraproc_la_SOURCES = liblumieraproc_la_SOURCES =