ichthyo/LUMIERA.clone
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Corrected errors introduced by the merge

Browse source
This commit is contained in:
Joel Holdsworth 2008-12-20 15:55:46 +00:00
parent 94a07a1464
commit c536915b2e
3 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/backend/Makefile.am
View file

@ -19,7 +19,8 @@ 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
#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 = \

2
src/gui/Makefile.am
View file

@ -82,7 +82,7 @@ libgui_la_CPPFLAGS = $(AM_CPPFLAGS) \
-DPACKAGE_DATA_DIR=\""$(datadir)"\" \ -DPACKAGE_DATA_DIR=\""$(datadir)"\" \
$(LUMIERA_GUI_CFLAGS) $(LUMIERA_GUI_CFLAGS)
lumigui_SOURCES = \ libgui_la_SOURCES = \
$(lumigui_srcdir)/gtk-lumiera.cpp \ $(lumigui_srcdir)/gtk-lumiera.cpp \
$(lumigui_srcdir)/gtk-lumiera.hpp \ $(lumigui_srcdir)/gtk-lumiera.hpp \
$(lumigui_srcdir)/window-manager.cpp \ $(lumigui_srcdir)/window-manager.cpp \

2
src/gui/model/parent-track.hpp
View file

@ -26,7 +26,7 @@
*/ */
#include "track.hpp" #include "track.hpp"
#include "../../common/observable-list.hpp" #include "../../lib/observable-list.hpp"
#ifndef PARENT_TRACK_HPP #ifndef PARENT_TRACK_HPP
#define PARENT_TRACK_HPP #define PARENT_TRACK_HPP