[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Gnash-commit] gnash gui/Makefile.am gui/gnash.in gui/am-frag/...
From: |
Rob Savoye |
Subject: |
[Gnash-commit] gnash gui/Makefile.am gui/gnash.in gui/am-frag/... |
Date: |
Sun, 17 Feb 2008 02:04:28 +0000 |
CVSROOT: /sources/gnash
Module name: gnash
Changes by: Rob Savoye <rsavoye> 08/02/17 02:04:28
Modified files:
gui : Makefile.am gnash.in
gui/am-frag : gtk.am
plugin : Makefile.am
plugin/klash : Makefile.am
. : ChangeLog
Log message:
* gui/Makefile.am: Add GLIB_CFLAGS. Install shell with
INSTALL_DATA.
* gui/am-frag/gtk.am: Include X11_CFLAGS to keep NetBSD happy.
* pugin/Makefile.am: Include X11_CFLAGS to keep NetBSD happy.
* plugin/klash/Makefile.am: Include X11_CFLAGS to keep NetBSD
happy.
* gui/gnash.in: Update copyright.
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/gui/Makefile.am?cvsroot=gnash&r1=1.117&r2=1.118
http://cvs.savannah.gnu.org/viewcvs/gnash/gui/gnash.in?cvsroot=gnash&r1=1.7&r2=1.8
http://cvs.savannah.gnu.org/viewcvs/gnash/gui/am-frag/gtk.am?cvsroot=gnash&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/gnash/plugin/Makefile.am?cvsroot=gnash&r1=1.68&r2=1.69
http://cvs.savannah.gnu.org/viewcvs/gnash/plugin/klash/Makefile.am?cvsroot=gnash&r1=1.43&r2=1.44
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.5674&r2=1.5675
Patches:
Index: gui/Makefile.am
===================================================================
RCS file: /sources/gnash/gnash/gui/Makefile.am,v
retrieving revision 1.117
retrieving revision 1.118
diff -u -b -r1.117 -r1.118
--- gui/Makefile.am 1 Feb 2008 05:48:34 -0000 1.117
+++ gui/Makefile.am 17 Feb 2008 02:04:26 -0000 1.118
@@ -46,6 +46,7 @@
-I$(top_srcdir)/libmedia/gst \
-DLOCALEDIR=\"$(localedir)\" \
-DPLUGINSDIR=\"$(pluginsdir)\" \
+ $(GLIB_CFLAGS) \
$(LIBXML_CFLAGS) \
$(DMALLOC_CFLAGS) \
$(LIRC_CFLAGS) \
@@ -164,8 +165,8 @@
bin_PROGRAMS =
gnash: gnash.in
- cp $< $@
- chmod +x $@
+ $(INSTALL_DATA) $? gnash
+ chmod a+x gnash
GUI_SRCS = gnash.cpp \
gui.cpp gui.h \
Index: gui/gnash.in
===================================================================
RCS file: /sources/gnash/gnash/gui/gnash.in,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- gui/gnash.in 22 Nov 2007 16:19:57 -0000 1.7
+++ gui/gnash.in 17 Feb 2008 02:04:26 -0000 1.8
@@ -3,7 +3,7 @@
#
# gnash: Wrapper script for running the different GUI versions of gnash
#
-# Copyright (C) 2005, 2006, 2007 Free Software Foundation, Inc.
+# Copyright (C) 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -20,14 +20,11 @@
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
#
-
#
# TODO:
# Handle --version on your own (or GUI config reported would be the one
of the default executable)
#
-
-
#!/bin/sh
GUIS="gtk kde sdl fltk aqua riscos fb alp hildon"
Index: gui/am-frag/gtk.am
===================================================================
RCS file: /sources/gnash/gnash/gui/am-frag/gtk.am,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- gui/am-frag/gtk.am 21 Jan 2008 21:19:22 -0000 1.3
+++ gui/am-frag/gtk.am 17 Feb 2008 02:04:27 -0000 1.4
@@ -25,7 +25,7 @@
endif
gtk_gnash_SOURCES = $(GUI_SRCS) gui_gtk.cpp
gtk_gnash_CPPFLAGS = -DGUI_GTK -DGUI_CONFIG=\"GTK\" \
- $(AM_CPPFLAGS) $(GTK_CFLAGS)
+ $(AM_CPPFLAGS) $(GTK_CFLAGS) $(X11_CFLAGS)
gtk_gnash_LDFLAGS = $(LIBLTDL) -export-dynamic $(AM_LDFLAGS)
#gtk_gnash_DEPENDENCIES = .configline
Index: plugin/Makefile.am
===================================================================
RCS file: /sources/gnash/gnash/plugin/Makefile.am,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -b -r1.68 -r1.69
--- plugin/Makefile.am 21 Jan 2008 23:28:02 -0000 1.68
+++ plugin/Makefile.am 17 Feb 2008 02:04:27 -0000 1.69
@@ -15,7 +15,7 @@
# along with this program; if not, write to the Free Software
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-# $Id: Makefile.am,v 1.68 2008/01/21 23:28:02 rsavoye Exp $
+# $Id: Makefile.am,v 1.69 2008/02/17 02:04:27 rsavoye Exp $
AUTOMAKE_OPTIONS =
@@ -41,6 +41,7 @@
-I$(srcdir)/mozilla-sdk \
-I$(srcdir)/mozilla-sdk/include \
$(GLIB_CFLAGS) \
+ $(X11_CFLAGS) \
$(GTK2_CFLAGS) \
$(CAIRO_CFLAGS) \
$(GLIB_CFLAGS) \
Index: plugin/klash/Makefile.am
===================================================================
RCS file: /sources/gnash/gnash/plugin/klash/Makefile.am,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -b -r1.43 -r1.44
--- plugin/klash/Makefile.am 13 Feb 2008 03:14:20 -0000 1.43
+++ plugin/klash/Makefile.am 17 Feb 2008 02:04:27 -0000 1.44
@@ -1,6 +1,6 @@
## Process this file with automake to generate Makefile.in
#
-# Copyright (C) 2005, 2006 Free Software Foundation, Inc.
+# Copyright (C) 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -15,12 +15,14 @@
# along with this program; if not, write to the Free Software
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-# $Id: Makefile.am,v 1.43 2008/02/13 03:14:20 rsavoye Exp $
-
AUTOMAKE_OPTIONS =
if KPARTS
-AM_CPPFLAGS= $(KDE_CFLAGS) $(QT_CFLAGS) -DGNASHBINDIR=\"${bindir}\"
+AM_CPPFLAGS = \
+ $(KDE_CFLAGS) \
+ $(QT_CFLAGS) \
+ $(X11_CFLAGS) \
+ -DGNASHBINDIR=\"${bindir}\"
plugindir = $(KDE_PLUGINDIR)
kde_servicesdir = $(KDE_SERVICESDIR)
@@ -80,13 +82,11 @@
fi; \
fi
-install-data-am: $(dist_kde_services_DATA)
+install-data-am: $(dist_kde_services_DATA) $(dist_kde_appsdata_DATA)
test -d $(DESTDIR)$(kde_servicesdir) || $(mkinstalldirs)
$(DESTDIR)$(kde_servicesdir)
$(INSTALL) $(srcdir)/$(dist_kde_services_DATA)
$(DESTDIR)$(kde_servicesdir)
-
-# install-plugin-data:
-# test -d $(DESTDIR)$(kde_servicesdir) || $(mkinstalldirs)
$(DESTDIR)$(kde_servicesdir)
-# $(INSTALL) $(dist_kde_services_DATA) $(DESTDIR)$(kde_servicesdir)
+ test -d $(DESTDIR)$(kde_appsdatadir) || $(mkinstalldirs)
$(DESTDIR)$(kde_appsdatadir)
+ $(INSTALL) $(srcdir)/$(dist_kde_appsdata_DATA)
$(DESTDIR)$(kde_appsdatadir)
install-pluginLTLIBRARIES: $(plugin_LTLIBRARIES)
@echo "Nothing to install here now."
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.5674
retrieving revision 1.5675
diff -u -b -r1.5674 -r1.5675
--- ChangeLog 17 Feb 2008 01:21:59 -0000 1.5674
+++ ChangeLog 17 Feb 2008 02:04:27 -0000 1.5675
@@ -1,5 +1,13 @@
2008-02-16 Rob Savoye <address@hidden>
+ * gui/Makefile.am: Add GLIB_CFLAGS. Install shell with
+ INSTALL_DATA.
+ * gui/am-frag/gtk.am: Include X11_CFLAGS to keep NetBSD happy.
+ * pugin/Makefile.am: Include X11_CFLAGS to keep NetBSD happy.
+ * plugin/klash/Makefile.am: Include X11_CFLAGS to keep NetBSD
+ happy.
+ * gui/gnash.in: Update copyright.
+
* macros/boost.m4: The serialization is optional, not required.
* macros/pthread.m4: Match all BSD hosts when setting flags.
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Gnash-commit] gnash gui/Makefile.am gui/gnash.in gui/am-frag/...,
Rob Savoye <=