[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Gnash-commit] gnash plugin/klash/Makefile.am gui/Makefile.am ... [relea
|
From: |
Rob Savoye |
|
Subject: |
[Gnash-commit] gnash plugin/klash/Makefile.am gui/Makefile.am ... [release_0_7_2] |
|
Date: |
Tue, 31 Oct 2006 16:35:05 +0000 |
CVSROOT: /sources/gnash
Module name: gnash
Branch: release_0_7_2
Changes by: Rob Savoye <rsavoye> 06/10/31 16:35:05
Modified files:
plugin/klash : Makefile.am
gui : Makefile.am
. : configure.ac ChangeLog
Log message:
* gui/Makefile.am: Only build klash if using KDE.
* plugin/klash/Makefile.am: Build klash here again.
* configure.ac: Don't turn KDE on when building klash. Remove
kde support from --enable-gui for now as it's totally broken.
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/plugin/klash/Makefile.am?cvsroot=gnash&only_with_tag=release_0_7_2&r1=1.17.2.1&r2=1.17.2.2
http://cvs.savannah.gnu.org/viewcvs/gnash/gui/Makefile.am?cvsroot=gnash&only_with_tag=release_0_7_2&r1=1.39.2.1&r2=1.39.2.2
http://cvs.savannah.gnu.org/viewcvs/gnash/configure.ac?cvsroot=gnash&only_with_tag=release_0_7_2&r1=1.186.2.5&r2=1.186.2.6
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&only_with_tag=release_0_7_2&r1=1.1412.2.31&r2=1.1412.2.32
Patches:
Index: plugin/klash/Makefile.am
===================================================================
RCS file: /sources/gnash/gnash/plugin/klash/Makefile.am,v
retrieving revision 1.17.2.1
retrieving revision 1.17.2.2
diff -u -b -r1.17.2.1 -r1.17.2.2
--- plugin/klash/Makefile.am 30 Oct 2006 14:28:47 -0000 1.17.2.1
+++ plugin/klash/Makefile.am 31 Oct 2006 16:35:05 -0000 1.17.2.2
@@ -17,7 +17,7 @@
#
-# $Id: Makefile.am,v 1.17.2.1 2006/10/30 14:28:47 rsavoye Exp $
+# $Id: Makefile.am,v 1.17.2.2 2006/10/31 16:35:05 rsavoye Exp $
AUTOMAKE_OPTIONS =
@@ -70,10 +70,12 @@
$(PTHREAD_LIBS) \
$(LIB_KDEUI) \
$(LIB_KDECORE) \
- $(KDE_LDFLAGS)
-
+ $(KDE_LDFLAGS) \
+ $(LIB_KDEUI) \
+ $(LIB_KDECORE) \
+ $(QT_LDFLAGS)
-INCLUDES = -I.. \
+AM_INCLUDES = -I.. \
-I$(top_srcdir) \
-I$(top_srcdir)/server \
-I$(top_srcdir)/server/parser \
@@ -81,6 +83,7 @@
-I$(top_srcdir)/backend \
-I$(top_srcdir)/libamf \
-I$(top_srcdir)/libgeometry \
+ $(QT_INCLUDES) \
$(PTHREAD_CFLAGS) \
$(SDL_CFLAGS) \
$(LIBXML_CFLAGS) \
@@ -88,15 +91,35 @@
$(PNG_CFLAGS) \
$(JPEG_CFLAGS) \
$(MP3_CFLAGS) \
- $(OGG_CFLAGS)
+ $(OGG_CFLAGS) \
+ $(KDE_INCLS)
-CLEANFILES = klash_part.moc
+CLEANFILES = klash_part.moc klash.moc
dummy.cpp:
echo > dummy.cpp
messages: rc.cpp
$(XGETTEXT) *.cpp -o $(podir)/klash.pot
+if KLASH
+bin_PROGRAMS = klash
+
+klash_SOURCES = klash.cpp
+klash_CPPFLAGS = \
+ $(AM_INCLUDES) \
+ -DUSE_KDE
+klash_LDFLAGS =
+klash_LDADD = $(AM_LDFLAGS) \
+ ../../backend/libgnashbackend.la \
+ ../../server/libgnashserver.la \
+ ../../server/asobj/libgnashasobjs.la \
+ ../../libgeometry/libgnashgeo.la \
+ ../../libbase/libgnashbase.la
+
+klash_DEPENDENCIES = klash.moc
+BUILT_SOURCES = klash_part.moc klash.moc
+endif
+
klash_part.moc: $(srcdir)/klash_part.h
@if test x"$(MOC)" != x; then \
echo "Generating MOC file..."; \
@@ -106,3 +129,11 @@
ln -s $(srcdir)/klash_part.moc.in klash_part.moc; \
fi
+klash.moc: $(srcdir)/klash.cpp
+ @if test x"$(MOC)" != x; then \
+ echo "Generating MOC file..."; \
+ $(MOC) $(srcdir)/klash.cpp -o klash.moc; \
+ else \
+ echo "WARNING: Install QT's moc tool! Linking to default MOC file"; \
+ ln -s $(srcdir)/klash.moc.in klash.moc; \
+ fi
Index: gui/Makefile.am
===================================================================
RCS file: /sources/gnash/gnash/gui/Makefile.am,v
retrieving revision 1.39.2.1
retrieving revision 1.39.2.2
diff -u -b -r1.39.2.1 -r1.39.2.2
--- gui/Makefile.am 30 Oct 2006 14:28:46 -0000 1.39.2.1
+++ gui/Makefile.am 31 Oct 2006 16:35:05 -0000 1.39.2.2
@@ -17,7 +17,7 @@
#
-# $Id: Makefile.am,v 1.39.2.1 2006/10/30 14:28:46 rsavoye Exp $
+# $Id: Makefile.am,v 1.39.2.2 2006/10/31 16:35:05 rsavoye Exp $
AUTOMAKE_OPTIONS =
@@ -166,8 +166,8 @@
$(top_builddir)/backend/libgnashbackend.la \
$(AM_LDFLAGS)
-if KLASH
-bin_PROGRAMS = gnash klash
+if USE_GUI_KDE
+bin_PROGRAMS = klash
else
bin_PROGRAMS = gnash
endif
Index: configure.ac
===================================================================
RCS file: /sources/gnash/gnash/configure.ac,v
retrieving revision 1.186.2.5
retrieving revision 1.186.2.6
diff -u -b -r1.186.2.5 -r1.186.2.6
--- configure.ac 30 Oct 2006 17:22:12 -0000 1.186.2.5
+++ configure.ac 31 Oct 2006 16:35:05 -0000 1.186.2.6
@@ -15,7 +15,7 @@
dnl Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
dnl
-dnl $Id: configure.ac,v 1.186.2.5 2006/10/30 17:22:12 strk Exp $
+dnl $Id: configure.ac,v 1.186.2.6 2006/10/31 16:35:05 rsavoye Exp $
AC_PREREQ(2.50)
AC_INIT(gnash, 0.7.2)
@@ -135,8 +135,6 @@
[case "${enableval}" in
gtk|GTK) gui=gtk ;;
sdl|SDL) gui=sdl ;;
- kde|KDE) gui=kde ;;
- fltk|FLTK) gui=fltk ;;
fb|FB) gui=fb ;;
*) AC_MSG_ERROR([invalid gui ${enableval} given]) ;;
esac],
@@ -145,15 +143,13 @@
case "${gui}" in
gtk) AC_DEFINE([GUI_GTK], [1], [Use GTK gui toolkit]) ;;
sdl) AC_DEFINE([GUI_SDL], [1], [Use SDL gui toolkit]) ;;
- kde) AC_DEFINE([GUI_KDE], [1], [Use KDE gui toolkit]) ;;
- fltk) AC_DEFINE([GUI_FLTK], [1], [Use FLTK gui toolkit]) ;;
fb) AC_DEFINE([GUI_FB], [1], [Use Framebuffer, no gui toolkit]) ;;
*)
esac
AM_CONDITIONAL(USE_GUI_GTK, test x$gui = xgtk)
AM_CONDITIONAL(USE_GUI_SDL, test x$gui = xsdl)
-AM_CONDITIONAL(USE_GUI_KDE, test x$gui = xkde -o x$klash = xyes)
+AM_CONDITIONAL(USE_GUI_KDE, test x$gui = xkde)
AM_CONDITIONAL(USE_GUI_FLTK, test x$gui = xfltk)
AM_CONDITIONAL(USE_GUI_FB, test x$gui = xfb)
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.1412.2.31
retrieving revision 1.1412.2.32
diff -u -b -r1.1412.2.31 -r1.1412.2.32
--- ChangeLog 31 Oct 2006 15:59:26 -0000 1.1412.2.31
+++ ChangeLog 31 Oct 2006 16:35:05 -0000 1.1412.2.32
@@ -1,3 +1,10 @@
+2006-10-31 Rob Savoye <address@hidden>
+
+ * gui/Makefile.am: Only build klash if using KDE.
+ * plugin/klash/Makefile.am: Build klash here again.
+ * configure.ac: Don't turn KDE on when building klash. Remove
+ kde support from --enable-gui for now as it's totally broken.
+
2006-10-31 Sandro Santilli <address@hidden>
* server/asobj/MovieClipLoader.cpp: fixed event handlers calls
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Gnash-commit] gnash plugin/klash/Makefile.am gui/Makefile.am ... [release_0_7_2],
Rob Savoye <=