Update to 0.8.2, based on pkgsrc-wip package by Paulo Matias.

Additional changes:
kde option compiles now, use standard installation method for
Firefox plugin.

2008-02-21  Sandro Santilli <strk@keybit.net>

Fifth alpha release of Gnash (0.8.2).
Improvements since 0.8.1 release are:

    - Improved timeline redesign.
    - Action execution order fixes.
    - Keyboard handling improved [1].
    - New classes implemented: System.capabilities (partial),
      SharedObject, LocalConnection.
    - New opcodes implemented: ActionImplements, Try/Throw.
    - Movieclip.beginGradientFill completes drawing API support.
    - MovieClip._lockroot support added.
    - Implement GET/POST for MovieClip.loadVariables and
      MovieClip.loadMovie
    - Textfield support improved.
    - Security: configurable sandbox restricts filesystem access by movies.
    - Better support for SWF8.
    - Streaming OGG-contained multimedia (e.g. vorbis/theora or vorbis/dirac),
      and other free formats.
    - OGL and Cairo renderers much improved.
    - Improvements of the Framebuffer GUI (hide text messages, support Linux
      events system, built-in touchscreen calibration, simple keyboard support,
      better architecture support).
    - SOLdumper utility for reading SOL files ('flash cookies').
    - DumpShm utility finds and dumps Local Connection memory segments.
    - Fullscreen display possible.
    - Extensions for LIRC and DBus.
    - High quality, cross-platform psuedo-randomness using boost random.
    - NPAPI (Mozilla) plugin: keyboard events work, navigation and javascript
      from within movies.
    - Set and save preferences from the GUI (GTK).
    - Improved stability and robustness with malformed SWFs.
    - Many other bugfixes.

2007-08-29  Sandro Santilli <strk@keybit.net>

Fourth alpha release of Gnash (0.8.1).
Improvements since 0.8.0 release are:

	- Garbage Collector
	- Support for device fonts
	- Support for dynamic text fields
	- Better key handling
	- Support for FFMPEG SVN
	- Support for on-demand install of needed Gstreamer codec plugins.
	- Debugger off by default (improves performance and memory use)
	- AGG renderer by default
	- Support for KDE/AGG combination
	- Layout change : we'll now build <gui>-gnash and 'gnash' is a shell
	  script with gui selection capabilities (-G)
	- More robust parser
	- Better support for flash player detection
	- Fix for 'debugLog' directive in gnashrc

11 files changed, 175 insertions, 153 deletions

diff --git a/multimedia/gnash/Makefile b/multimedia/gnash/Makefile
index 03df8c94477..7024b234422 100644
--- a/multimedia/gnash/Makefile
+++ b/multimedia/gnash/Makefile
@@ -1,14 +1,13 @@
-# $NetBSD: Makefile,v 1.13 2008/01/18 05:08:37 tnn Exp $
+# $NetBSD: Makefile,v 1.14 2008/04/27 06:44:52 wiz Exp $
 #
 
-DISTNAME=		gnash-0.8.0
-PKGREVISION=		4
+DISTNAME=		gnash-0.8.2
 CATEGORIES=		multimedia
-MASTER_SITES=		${MASTER_SITE_GNU:=gnash/0.8.0/}
+MASTER_SITES=		${MASTER_SITE_GNU:=gnash/0.8.2/}
 EXTRACT_SUFX=		.tar.bz2
 
-MAINTAINER=		pkgsrc-users@NetBSD.org
-HOMEPAGE=		http://www.gnu.org/software/gnash/
+MAINTAINER=		matias@dotbsd.org
+HOMEPAGE=		http://www.gnashdev.org/
 COMMENT=		GPL Flash movie player
 
 PKG_DESTDIR_SUPPORT=	user-destdir
@@ -17,9 +16,10 @@ USE_PKGLOCALEDIR=	yes
 USE_LANGUAGES=		c c++
 USE_LIBTOOL=		yes
 GNU_CONFIGURE=		yes
-CONFIGURE_ARGS+=	--enable-mp3
-CONFIGURE_ARGS+=	--enable-media=mad
-USE_TOOLS+=		bash msgfmt pkg-config
+USE_TOOLS+=		bash gmake msgfmt pkg-config
+CONFIGURE_ARGS+=	--with-npapi-plugindir=${PREFIX}/lib/firefox/plugins
+# for appending below
+INSTALL_TARGET=		install
 
 # /bin/sh finds a syntax error without line number
 CONFIG_SHELL=		${TOOLS_BASH}
@@ -28,20 +28,15 @@ CONFIG_SHELL=		${TOOLS_BASH}
 
 PLIST_SRC+=		${PKGDIR}/PLIST
 
-.include "../../audio/SDL_mixer/buildlink3.mk"
-.include "../../audio/libmad/buildlink3.mk"
-.include "../../devel/SDL/buildlink3.mk"
 .include "../../devel/boost-libs/buildlink3.mk"
 .include "../../devel/libltdl/buildlink3.mk"
 .include "../../devel/zlib/buildlink3.mk"
-.include "../../graphics/gtkglext/buildlink3.mk"
 .include "../../graphics/jpeg/buildlink3.mk"
 .include "../../graphics/png/buildlink3.mk"
-.include "../../multimedia/libogg/buildlink3.mk"
 .include "../../textproc/libxml2/buildlink3.mk"
 .include "../../www/curl/buildlink3.mk"
-.include "../../x11/gtk2/buildlink3.mk"
 .include "../../x11/libXft/buildlink3.mk"
+.include "../../fonts/fontconfig/buildlink3.mk"
 
 .include "../../mk/oss.buildlink3.mk"
 .include "../../mk/pthread.buildlink3.mk"
diff --git a/multimedia/gnash/PLIST b/multimedia/gnash/PLIST
index 5da93ef0c23..db3f79f493c 100644
--- a/multimedia/gnash/PLIST
+++ b/multimedia/gnash/PLIST
@@ -1,19 +1,33 @@
-@comment $NetBSD: PLIST,v 1.3 2007/06/14 06:01:29 wiz Exp $
-bin/cygnal
+@comment $NetBSD: PLIST,v 1.4 2008/04/27 06:44:52 wiz Exp $
+bin/dumpshm
 bin/gnash
-bin/gparser
 bin/gprocessor
-lib/libgnashamf.la
-lib/libgnashbackend.la
-lib/libgnashbase.la
-lib/libgnashgeo.la
-lib/libgnashgui.la
-lib/libgnashplayer.la
-lib/libgnashserver.la
+bin/soldumper
+lib/gnash/libgnashamf.la
+lib/gnash/libgnashbase.la
+lib/gnash/libgnashmedia.la
+lib/gnash/libgnashserver.la
+man/man1/cygnal.1
+man/man1/dumpshm.1
 man/man1/gnash.1
-share/gnash/GnashG.png
-share/gnash/gnash_128_96.ico
-share/locale/de/gnash.mo
-share/locale/es/gnash.mo
-share/locale/fr/gnash.mo
-@dirrm share/gnash
+man/man1/gprocessor.1
+man/man1/soldumper.1
+share/doc/gnash/gnashref.html
+share/doc/gnash/gnashuser.html
+share/doc/gnash/images/car_crash.png
+share/doc/gnash/images/rtmp.png
+share/${KDE}gnash/GnashG.png
+share/${KDE}gnash/gnash_128_96.ico
+share/${KDE}locale/cs/LC_MESSAGES/gnash.mo
+share/${KDE}locale/de/LC_MESSAGES/gnash.mo
+share/${KDE}locale/es/LC_MESSAGES/gnash.mo
+share/${KDE}locale/fi/LC_MESSAGES/gnash.mo
+share/${KDE}locale/fr/LC_MESSAGES/gnash.mo
+share/${KDE}locale/it/LC_MESSAGES/gnash.mo
+share/${KDE}locale/sv/LC_MESSAGES/gnash.mo
+@dirrm share/${KDE}gnash
+@dirrm share/doc/gnash/images
+@dirrm share/doc/gnash
+@dirrm lib/gnash
+@unexec ${RMDIR} %D/lib/firefox/plugins 2>/dev/null || ${TRUE}
+@unexec ${RMDIR} %D/lib/firefox 2>/dev/null || ${TRUE}
diff --git a/multimedia/gnash/PLIST.gtk b/multimedia/gnash/PLIST.gtk
new file mode 100644
index 00000000000..06e69bc7354
--- /dev/null
+++ b/multimedia/gnash/PLIST.gtk
@@ -0,0 +1,3 @@
+@comment $NetBSD: PLIST.gtk,v 1.1 2008/04/27 06:44:52 wiz Exp $
+bin/gtk-gnash
+lib/firefox/plugins/libgnashplugin.so
diff --git a/multimedia/gnash/PLIST.kde b/multimedia/gnash/PLIST.kde
new file mode 100644
index 00000000000..1a21c849171
--- /dev/null
+++ b/multimedia/gnash/PLIST.kde
@@ -0,0 +1,7 @@
+@comment $NetBSD: PLIST.kde,v 1.1 2008/04/27 06:44:52 wiz Exp $
+bin/kde-gnash
+share/kde/apps/klash/pluginsinfo
+share/kde/services/klash_part.desktop
+@dirrm share/kde/apps/klash
+@comment in kde: @dirrm share/kde/apps
+@comment in kde: @dirrm share/kde
diff --git a/multimedia/gnash/PLIST.klash b/multimedia/gnash/PLIST.klash
deleted file mode 100644
index c54464ac3dc..00000000000
--- a/multimedia/gnash/PLIST.klash
+++ /dev/null
@@ -1,16 +0,0 @@
-@comment $NetBSD: PLIST.klash,v 1.2 2007/06/12 21:26:15 ghen Exp $
-bin/klash
-lib/kde3/libklashpart.la
-lib/libklashplayer-0.8.0.so
-lib/libklashplayer.a
-lib/libklashplayer.la
-lib/libklashplayer.so
-share/apps/klash/klashpartui.rc
-share/apps/klash/pluginsinfo
-share/gnash/plugins/libgnashplugin.la
-share/services/klash_part.desktop
-@dirrm share/apps/klash
-@comment in kde: dirrm share/kde/services
-@dirrm share/gnash/plugins
-@comment in kde: dirrm share/kde/config
-@comment in kde: @dirrm lib/kde3
diff --git a/multimedia/gnash/distinfo b/multimedia/gnash/distinfo
index 83170223070..6b8af3ed612 100644
--- a/multimedia/gnash/distinfo
+++ b/multimedia/gnash/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.8 2007/06/30 15:11:24 joerg Exp $
+$NetBSD: distinfo,v 1.9 2008/04/27 06:44:52 wiz Exp $
 
-SHA1 (gnash-0.8.0.tar.bz2) = b03d3c03bb93b0ebaf5ad10cabd3d7fef2434f7e
-RMD160 (gnash-0.8.0.tar.bz2) = 6c885c283345973d27206f6e3f90635264a724ae
-Size (gnash-0.8.0.tar.bz2) = 2053076 bytes
-SHA1 (patch-aa) = 4774c9bd41ca69611f980c85e79763b159a262ed
-SHA1 (patch-ab) = c361305a5dd508907d4408f16ec7a748186a5f6e
+SHA1 (gnash-0.8.2.tar.bz2) = 1d524f9a5e96037db4159fe6142b0c228b6130be
+RMD160 (gnash-0.8.2.tar.bz2) = 63466362edae138bc976f9c025f36703c7edce9f
+Size (gnash-0.8.2.tar.bz2) = 2637636 bytes
+SHA1 (patch-ae) = d4f18032bc091e5ef84fcb81f16ea649c5c20701
+SHA1 (patch-ag) = f4f82df7bff71464cdb3a76b91c4b2475a8e9eef
diff --git a/multimedia/gnash/options.mk b/multimedia/gnash/options.mk
index 8bca3aead02..15d61ae25c7 100644
--- a/multimedia/gnash/options.mk
+++ b/multimedia/gnash/options.mk
@@ -1,20 +1,99 @@
-# $NetBSD: options.mk,v 1.4 2007/06/12 08:51:14 ghen Exp $
+# $NetBSD: options.mk,v 1.5 2008/04/27 06:44:52 wiz Exp $
 #
 
-PKG_OPTIONS_VAR=	PKG_OPTIONS.gnash
-PKG_SUPPORTED_OPTIONS=	klash
+#
+# see http://www.gnu.org/software/gnash/manual/gnashref.html#codedeps
+#
+
+PKG_OPTIONS_VAR=		PKG_OPTIONS.gnash
+PKG_SUPPORTED_OPTIONS=		gtk kde agg cairo mitshm opengl
+PKG_OPTIONS_OPTIONAL_GROUPS=    gnash-media
+PKG_OPTIONS_GROUP.gnash-media=  ffmpeg gstreamer
+PKG_SUGGESTED_OPTIONS+=         agg gstreamer gtk mitshm
 
 .include "../../mk/bsd.options.mk"
 
-.if !empty(PKG_OPTIONS:Mklash)
-PLIST_SRC+=		${PKGDIR}/PLIST.klash
+###
+### Select GUIs.
+###
+.if !empty(PKG_OPTIONS:Mgtk)
+GNASH_GUIS+=		gtk
+PLIST_SRC+=		${PKGDIR}/PLIST.gtk
+CONFIGURE_ARGS+=	--with-npapi-plugindir=${PREFIX}/lib/firefox/plugins
+INSTALL_TARGET+=	install-plugin
+.include "../../x11/gtk2/buildlink3.mk"
+.endif
+
+.if !empty(PKG_OPTIONS:Mkde)
+GNASH_GUIS+=		kde
+PLIST_SRC+=		${PKGDIR}/PLIST.kde
+PLIST_SUBST+=		KDE="kde/"
 .include "../../x11/kdebase3/buildlink3.mk"
 .include "../../meta-pkgs/kde3/kde3.mk"
-CONFIGURE_ARGS+=	--datadir="${PREFIX}/share"
-CONFIGURE_ARGS+=	\
-	--with-plugindir=${PREFIX}/share/gnash/plugins
-CONFIGURE_ARGS+=	--enable-klash
 .else
-CONFIGURE_ARGS+=	--disable-klash
-CONFIGURE_ARGS+=	--disable-plugin
+PLIST_SUBST+=		KDE=""
+.endif
+
+CONFIGURE_ARGS+=	--enable-gui=${GNASH_GUIS:tW:S/ /,/}
+
+###
+### Select renderers.
+###
+.if !empty(PKG_OPTIONS:Magg)
+GNASH_RENDERS+=		agg
+.include "../../graphics/agg/buildlink3.mk"
+.endif
+
+.if !empty(PKG_OPTIONS:Mcairo)
+GNASH_RENDERS+=		cairo
+.include "../../graphics/cairo/buildlink3.mk"
+.endif
+
+.if !empty(PKG_OPTIONS:Mopengl)
+GNASH_RENDERS+=		ogl
+.include "../../x11/glproto/buildlink3.mk"
+.if !empty(PKG_OPTIONS:Mgtk)
+.include "../../graphics/gtkglext/buildlink3.mk"
+.endif
+.endif
+
+CONFIGURE_ARGS+=	--enable-renderer=${GNASH_RENDERS:tW:S/ /,/}
+
+###
+### Select a media handler
+###
+.if !empty(PKG_OPTIONS:Mffmpeg)
+CONFIGURE_ARGS+=	--enable-media=ffmpeg
+.include "../../audio/SDL_mixer/buildlink3.mk"
+.include "../../devel/SDL/buildlink3.mk"
+.include "../../multimedia/ffmpeg-devel/buildlink3.mk"
+# is ffmpeg-devel buildlink broken? we need all that:
+.include "../../audio/faac/buildlink3.mk"
+.include "../../audio/lame/buildlink3.mk"
+.include "../../multimedia/libtheora/buildlink3.mk"
+.include "../../multimedia/libogg/buildlink3.mk"
+.include "../../audio/libvorbis/buildlink3.mk"
+.include "../../multimedia/x264-devel/buildlink3.mk"
+# --------------------------------------------------
+.endif
+
+.if !empty(PKG_OPTIONS:Mgstreamer)
+CONFIGURE_ARGS+=	--enable-media=gst --enable-gstreamer
+.include "../../multimedia/gstreamer0.10/buildlink3.mk"
+# see http://bjacques.org/gst-plugins
+DEPENDS+= gst-plugins0.10-base-[0-9]*:../../multimedia/gst-plugins0.10-base
+DEPENDS+= gst-plugins0.10-oss-[0-9]*:../../audio/gst-plugins0.10-oss
+DEPENDS+= gst-fluendo-mp3-0.10.[0-9]*:../../audio/gst-plugins0.10-fluendo-mp3
+DEPENDS+= gst-ffmpeg-0.10.[0-9]*:../../multimedia/gst-plugins0.10-ffmpeg
+DEPENDS+= gst-plugins0.10-gnomevfs-[0-9]*:../../sysutils/gst-plugins0.10-gnomevfs
+DEPENDS+= gst-plugins0.10-x11-[0-9]*:../../x11/gst-plugins0.10-x11
+.endif
+
+###
+### MIT-SHM Support.
+###
+.if !empty(PKG_OPTIONS:Mmitshm)
+CONFIGURE_ARGS+=	--enable-mit-shm
+.else
+CONFIGURE_ARGS+=	--disable-mit-shm
 .endif
diff --git a/multimedia/gnash/patches/patch-aa b/multimedia/gnash/patches/patch-aa
deleted file mode 100644
index 9eb4ce4ea96..00000000000
--- a/multimedia/gnash/patches/patch-aa
+++ /dev/null
@@ -1,76 +0,0 @@
-$NetBSD: patch-aa,v 1.8 2007/06/30 15:11:24 joerg Exp $
-
---- configure.orig	2007-06-09 01:41:56.000000000 +0000
-+++ configure
-@@ -8239,13 +8239,13 @@ echo $ECHO_N "checking for library file 
-   LIBPRE="lib"
- 
-   if test "x$LIBPRE" != "x" ; then
--    if test x"$EXEEXT"	== "exe"; then
-+    if test x"$EXEEXT"	= "exe"; then
-       LIBPRE="lib"
-     fi
-   fi
- 
-   if test "x$LIBEXT" != "x" ; then
--    if test x"$EXEEXT"	== "exe"; then
-+    if test x"$EXEEXT"	= "exe"; then
-       LIBEXT="dll"
-     fi
-   fi
-@@ -20065,7 +20065,7 @@ echo $ECHO_N "checking for qt header... 
-     fi
-   done
- 
--  if test "x$gnash_qt_version" == x; then
-+  if test "x$gnash_qt_version" = x; then
-     for i in $incllist; do
-       for j in `ls -dr $i/qt[0-9] 2>/dev/null`; do
-         if test -f $j/qobject.h; then
-@@ -47951,7 +47951,7 @@ DLPREOPEN="-dlpreopen"
- 
- 
- 
--if test x"$EXEEXT" == "exe"; then
-+if test x"$EXEEXT" = "exe"; then
- 
- cat >>confdefs.h <<\_ACEOF
- #define HAVE_WINSOCK 1
-@@ -48042,9 +48042,7 @@ ac_link='$CC -o conftest$ac_exeext $CFLA
- ac_compiler_gnu=$ac_cv_c_compiler_gnu
- 
- pthreads=no
--PTHREAD_LIBS=""
--PTHREAD_CFLAGS=""
--
-+PTHREAD_LIBS="${PTHREAD_LDFLAGS} ${PTHREAD_LIBS}"
- 
- if test x"$PTHREAD_LIBS$PTHREAD_CFLAGS" != x; then
-   save_CFLAGS="$CFLAGS"
-@@ -51973,7 +51971,7 @@ if $need_sdl; then
-     echo "               Install it from http://www.libsdl.org/download-1.2.php"
-     echo "               or .deb users: apt-get install libsdl1.2-dev"
-     echo "               or .rpm users: yum install SDL-devel"
--     x"$gui" == x"sdl"  &&
-+     x"$gui" = x"sdl"  &&
- 	echo "               or select a different GUI with --enable-gui= "
-      x"$media_handler" = x"ffmpeg" -o x"$media_handler" = x"mad"  &&
- 	echo "               or use --enable-media=gst"
-@@ -52057,7 +52055,7 @@ fi
- if test x"$BOOST_LIBS" != x; then
-     # Only cygnal requires date_time at present, so it's OK if either
-     # you don't want cygnal or do have date_time installed.
--    if test x"$cygnal" == xno -o x"$boost_date_time" = xyes; then
-+    if test x"$cygnal" = xno -o x"$boost_date_time" = xyes; then
- 	echo "        BOOST flags are: $BOOST_CFLAGS"
- 	echo "        BOOST libs are: $BOOST_LIBS"
-     else
-@@ -52072,7 +52070,7 @@ else
-     echo "        ERROR: No BOOST development package installed!"
-     echo "               Install it from http://www.boost.org"
-     echo "               or .deb users: apt-get install libboost-thread-dev"
--    if test x"$cygnal" == xyes; then
-+    if test x"$cygnal" = xyes; then
-     echo "                              and libboost-date-time-dev"
-     fi
-     echo "               or .rpm users: yum install boost-devel"
diff --git a/multimedia/gnash/patches/patch-ab b/multimedia/gnash/patches/patch-ab
deleted file mode 100644
index 3ee065f9db6..00000000000
--- a/multimedia/gnash/patches/patch-ab
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ab,v 1.2 2007/06/30 15:11:24 joerg Exp $
-
---- plugin/Makefile.in.orig	2006-12-06 00:14:28.000000000 +0100
-+++ plugin/Makefile.in	2006-12-06 00:23:19.000000000 +0100
-@@ -929,7 +929,7 @@
- #if PLUGIN_LINK_UNDEFINED
- #cp $(DESTDIR)$(plugindir)/.libs/libgnashplugin.so.0.* $(DESTDIR)$(plugindir)/libgnashplugin.so
- #endif
--	$(RM) $(DESTDIR)$(plugindir)/libgnashplugin.*a $(DESTDIR)$(plugindir)/libgnashplugin.so.0 $(DESTDIR)$(plugindir)/libgnashplugin.*.T
-+	#$(RM) $(DESTDIR)$(plugindir)/libgnashplugin.*a $(DESTDIR)$(plugindir)/libgnashplugin.so.0 $(DESTDIR)$(plugindir)/libgnashplugin.*.T
- 
- # install-pluginLTLIBRARIES: $(plugin_LTLIBRARIES)
- # 	if test -d $(HOME)/.firefox ; then \
diff --git a/multimedia/gnash/patches/patch-ae b/multimedia/gnash/patches/patch-ae
new file mode 100644
index 00000000000..af51536bff0
--- /dev/null
+++ b/multimedia/gnash/patches/patch-ae
@@ -0,0 +1,14 @@
+$NetBSD: patch-ae,v 1.1 2008/04/27 06:44:52 wiz Exp $
+
+--- gui/Makefile.in.orig	2008-04-25 17:05:02.000000000 +0200
++++ gui/Makefile.in
+@@ -1164,8 +1164,8 @@ GUI_SRCS = gnash.cpp \
+ @BUILD_QTOPIA_GUI_TRUE@	$(GNASH_LIBS) $(AM_LDFLAGS) \
+ @BUILD_QTOPIA_GUI_TRUE@	$(am__append_14) $(am__append_17)
+ @BUILD_KDE_GUI_TRUE@kde_gnash_CPPFLAGS = -DGUI_KDE \
+-@BUILD_KDE_GUI_TRUE@	-DGUI_CONFIG=\"KDE\" $(AM_CPPFLAGS) \
+ @BUILD_KDE_GUI_TRUE@	$(KDE_CFLAGS) $(QT_CFLAGS) \
++@BUILD_KDE_GUI_TRUE@	-DGUI_CONFIG=\"KDE\" $(AM_CPPFLAGS) \
+ @BUILD_KDE_GUI_TRUE@	$(am__append_22) $(am__append_25)
+ @BUILD_KDE_GUI_TRUE@kde_gnash_SOURCES = $(GUI_SRCS) gui_kde.cpp \
+ @BUILD_KDE_GUI_TRUE@	$(am__append_24) $(am__append_27)
diff --git a/multimedia/gnash/patches/patch-ag b/multimedia/gnash/patches/patch-ag
new file mode 100644
index 00000000000..a7a3d42f601
--- /dev/null
+++ b/multimedia/gnash/patches/patch-ag
@@ -0,0 +1,15 @@
+$NetBSD: patch-ag,v 1.1 2008/04/27 06:44:52 wiz Exp $
+
+--- gui/am-frag/kde.am.orig	2008-01-21 22:19:22.000000000 +0100
++++ gui/am-frag/kde.am
+@@ -23,8 +23,8 @@ bin_PROGRAMS += kde-gnash
+ if HAVE_QT_4
+ QT_CFLAGS += -DQT3_SUPPORT
+ endif
+-kde_gnash_CPPFLAGS = -DGUI_KDE -DGUI_CONFIG=\"KDE\" \
+-	 $(AM_CPPFLAGS) $(KDE_CFLAGS) $(QT_CFLAGS)
++kde_gnash_CPPFLAGS = $(KDE_CFLAGS) $(QT_CFLAGS) -DGUI_KDE -DGUI_CONFIG=\"KDE\" \
++	 $(AM_CPPFLAGS)
+ kde_gnash_SOURCES = $(GUI_SRCS) gui_kde.cpp
+ kde_gnash_LDFLAGS = $(LIBLTDL) -export-dynamic 
+ #kde_gnash_DEPENDENCIES = .configline