Hello,
I used to post those patches on the patch tracking system, however I feel
that it isn't very suited because they are huge and diverse and the
interface is less usable than mutt ;-)
I don't think it deserves a ChangeLog entry. Here are the explanations:
Makefile.am: always put doc and plugins in DIST_SUBDIRS otherwise
configure will fail with missing Makefile.in. Moreover it doesn't
make sense not to distribute doc or plugins (although it makes
sense not to build or install in those subdirs).
doc/omf.make: don't create anything in $(srcdir). It shouldn't be
touched upon when doing a build out of the srcdir (and could even
be read-only).
if GHELP isn't usefull because omf.make isn't included by
doc/C/Makefile.am if it GHELP is false.
doc/C/Makefile.am: remove duplicate xml files from entities.
add gnash-man.xml to EXTRA_DIST.
use automake man page handling for easy man pages installation.
add gnash.texi to EXTRA_DIST such that the info page isn't rebuilt
when it is not needed.
use sed instead of the make special var, as the make special vars
may not be portable accross all make.
add a missing x for the $(DB2X_VERSION) test.
remove unneeded --to-stdout.
replace the setfilename instead of just removing it.
in the suffix rule use the $< variable.
macros/ghelp.m4: don't warn if ./configure is not run by root, what matters
is whether make install is run by root or not (and the warnings are
rightly in doc/omf.make).
enable ghelp as default, because it is disabled if scrollkeeper
isn't found anyway.
server/, libamf/: minor cleanings
--
Pat
? doc/Doxyfile
? doc/doc.diff
? doc/omf.make-conflict
? doc/xmldocs.make-conflict
? doc/C/Makefile.am-conflict
? doc/C/Makefile.am-new
? doc/C/Makefile.am-new.1
? doc/C/gnash-C.omf-new
? doc/C/gnash-C.omf.out
? doc/C/gnash.1
? doc/C/gnash.info
? doc/C/gnash.omf-new
? doc/C/gnash.texi
? doc/C/gnash.txml
? doc/C/gnash.xml.txml
? doc/C/gnash_manual_v0.2.texi
? libamf/.deps
? libamf/.libs
? libamf/Makefile
? libamf/Makefile.in
? libamf/amf.lo
? libamf/amftest
? libamf/libgnashamf.la
Index: macros/ghelp.m4
===================================================================
RCS file: /sources/gnash/gnash/macros/ghelp.m4,v
retrieving revision 1.5
diff -u -3 -p -r1.5 ghelp.m4
--- macros/ghelp.m4 9 Feb 2006 15:15:28 -0000 1.5
+++ macros/ghelp.m4 14 Feb 2006 00:57:56 -0000
@@ -22,7 +22,7 @@ AC_DEFUN([GNASH_PATH_GHELP],
yes) ghelp=yes ;;
no) ghelp=no ;;
*) AC_MSG_ERROR([bad value ${enableval} for enable-ghelp option]) ;;
- esac], ghelp=no)
+ esac], ghelp=yes)
if test x"$ghelp" = x"yes" ; then
AC_PATH_PROG(SCROLLKEEPER, scrollkeeper-config, [],
@@ -31,14 +31,10 @@ AC_DEFUN([GNASH_PATH_GHELP],
[$PATH:/usr/bin/X11:/usr/local/bin/X11:/opt/X11])
AC_PATH_PROG(SCROLLINSTALL, scrollkeeper-preinstall, [],
[$PATH:/usr/bin/X11:/usr/local/bin/X11:/opt/X11])
- if test x"${SCROLLKEEPER}" != x"" ; then
- AC_MSG_CHECKING([the path to install under scrollkeeper])
- ghelp_install=`$SCROLLKEEPER --prefix`
- AC_MSG_RESULT(${ghelp_install})
- if test x"${ghelp_install}" = x"/usr"; then
- AC_MSG_WARN([You will need to be root to install under scrollkeeper])
- fi
- fi
+ fi
+ if test x"$SCROLLKEEPER" = x -o x"$SCROLLUPDATE" = x -o x"$SCROLLINSTALL" =
x ; then
+ ghelp=no
+ AC_MSG_WARN([You need to install scrollkeeper for gnome help])
fi
if test x"$SCROLLKEEPER" = x -o x"$SCROLLUPDATE" = x -o x"$SCROLLINSTALL" =
x ; then
ghelp=no
Index: Makefile.am
===================================================================
RCS file: /sources/gnash/gnash/Makefile.am,v
retrieving revision 1.13
diff -u -3 -p -r1.13 Makefile.am
--- Makefile.am 13 Feb 2006 01:15:59 -0000 1.13
+++ Makefile.am 14 Feb 2006 00:57:56 -0000
@@ -21,7 +21,7 @@ if DOCBOOK
DOC_DIRS = doc
endif
SUBDIRS = $(STD_DIRS) $(PLUG_DIR) $(DOC_DIRS)
-DIST_SUBDIRS = $(STD_DIRS) $(PLUG_DIR) $(DOC_DIRS) testsuite
+DIST_SUBDIRS = $(STD_DIRS) plugin doc testsuite
#EXTRA_DIST = macros
# if HTTP
Index: doc/omf.make
===================================================================
RCS file: /sources/gnash/gnash/doc/omf.make,v
retrieving revision 1.6
diff -u -3 -p -r1.6 omf.make
--- doc/omf.make 9 Feb 2006 15:15:28 -0000 1.6
+++ doc/omf.make 14 Feb 2006 00:57:56 -0000
@@ -33,22 +33,20 @@ omf: omf_timestamp
omf_timestamp: $(omffile)
@for file in $(omffile); do \
- $(SCROLLINSTALL) $(docdir)/$(docname).xml $(srcdir)/$$file
$(srcdir)/$$file.out; \
+ $(SCROLLINSTALL) $(docdir)/$(docname).xml $(srcdir)/$$file
$$file.out; \
done
touch omf_timestamp
install-data-hook-omf:
-if GHELP
$(mkinstalldirs) $(DESTDIR)$(omf_dest_dir)
for file in $(omffile); do \
- $(INSTALL_DATA) $(srcdir)/$$file.out
$(DESTDIR)$(omf_dest_dir)/$$file; \
+ $(INSTALL_DATA) $$file.out $(DESTDIR)$(omf_dest_dir)/$$file; \
done
if test x"$(USER)" = x"root" ; then \
$(SCROLLUPDATE) -v -p $(DESTDIR)$(scrollkeeper_localstate_dir) -o
$(DESTDIR)$(omf_dest_dir);\
else \
echo "ERROR: you must be root to install scrollkeeper files!";\
fi
-endif
uninstall-local-omf:
[EMAIL PROTECTED] file in $(omffile); do \
Index: doc/C/Makefile.am
===================================================================
RCS file: /sources/gnash/gnash/doc/C/Makefile.am,v
retrieving revision 1.10
diff -u -3 -p -r1.10 Makefile.am
--- doc/C/Makefile.am 11 Feb 2006 16:52:44 -0000 1.10
+++ doc/C/Makefile.am 14 Feb 2006 00:57:56 -0000
@@ -28,8 +28,7 @@ figdir = images
docname = gnash
lang = C
omffile = gnash-C.omf
-entities = legal.xml \
- gnash.xml \
+entities = \
sources.xml \
internals.xml \
accessibility.xml \
@@ -69,12 +68,13 @@ entities = legal.xml \
textsnapshot.xml \
video.xml \
xml.xml \
+ xmlnode.xml \
xmlsocket.xml
xml_files = $(entities) $(docname).xml
#noinst_SCRIPT = gen-doc.sh
-#dist_man_MANS = gnash.1
+dist_man_MANS = gnash.1
html: gnash.html
pdf: gnash.pdf
@@ -89,7 +89,9 @@ EXTRA_DIST = \
$(xml_files) \
$(omffile) \
gnash.info \
+ gnash.texi \
gnash.html \
+ gnash-man.xml \
gnash.1
.xml.html:
@@ -108,11 +110,11 @@ endif
.xml.texi:
if ENABLE_TEXI
- basefile=$(notdir $(basename $<)); \
+ basefile=`echo $< | sed -e 's,^.*/,,' -e 's,\.xml$$,,'`; \
$(DB2X_XSLTPROC) -s texi $< --output $${basefile}.txml; \
- if test x"$(DB2X_VERSION)" = "0.8.5"; then \
- $(DB2X_TEXIXML) --to-stdout $${basefile}.txml; \
- sed -e '/setfilename/d' $${basefile}_manual_v*.texi >
$${basefile}.texi; \
+ if test x"$(DB2X_VERSION)" = "x0.8.5"; then \
+ $(DB2X_TEXIXML) $${basefile}.txml; \
+ sed -e "s/setfilename $${basefile}_manual_v.*\.info/setfilename
$${basefile}.info/" $${basefile}_manual_v*.texi > $${basefile}.texi; \
else\
$(DB2X_TEXIXML) --to-stdout $${basefile}.txml > $${basefile}.texi ; \
fi
@@ -122,7 +124,7 @@ else
endif
.texi.info:
- $(MAKEINFO) --force gnash.texi
+ $(MAKEINFO) --force $<
gnash.1: gnash-man.xml
if ENABLE_MAN
@@ -139,7 +141,7 @@ lint:
@xmllint $(srcdir)/gnash.xml
CLEANFILES = \
- gnash.omf.out \
+ gnash-C.omf.out \
manpage.links \
manpage.refs \
gnash.tex \
Index: server/Makefile.am
===================================================================
RCS file: /sources/gnash/gnash/server/Makefile.am,v
retrieving revision 1.21
diff -u -3 -p -r1.21 Makefile.am
--- server/Makefile.am 13 Feb 2006 10:44:12 -0000 1.21
+++ server/Makefile.am 14 Feb 2006 00:57:56 -0000
@@ -143,6 +143,7 @@ noinst_HEADERS = $(as_incls) \
shm.h \
sound.h \
stream.h \
+ swf.h \
gstring.h \
Sprite.h \
styles.h \
Index: libamf/Makefile.am
===================================================================
RCS file: /sources/gnash/gnash/libamf/Makefile.am,v
retrieving revision 1.2
diff -u -3 -p -r1.2 Makefile.am
--- libamf/Makefile.am 13 Feb 2006 17:48:28 -0000 1.2
+++ libamf/Makefile.am 14 Feb 2006 00:57:56 -0000
@@ -38,16 +38,14 @@ AM_LDFLAGS = \
# AM_LDFLAGS = $(OPENGL_LIBNS) $(SDL_LIBS)
lib_LTLIBRARIES = libgnashamf.la
-libgnashamf_la_SOURCES = amf.cpp
-
-noinst_HEADERS = amf.h
+libgnashamf_la_SOURCES = amf.cpp amfutf8.h amf.h
INCLUDES = -I.. -I$(srcdir) \
-I$(top_srcdir)/server
noinst_PROGRAMS = amftest
-amftest_SOURCES = amftest.cpp
+amftest_SOURCES = amftest.cpp
amftest_LDADD = $(AM_LDFLAGS) libgnashamf.la
# Rebuild with GCC 4.x Mudflap support
_______________________________________________
Gnash mailing list
[email protected]
http://lists.gnu.org/mailman/listinfo/gnash
