[Gnash-commit] gnash ./ChangeLog ./Makefile.am doc/omf.make se...

[Sandro Santilli]

CVSROOT:        /sources/gnash
Module name:    gnash
Branch:         
Changes by:     Sandro Santilli <address@hidden>        06/05/23 07:59:21

Modified files:
        .              : ChangeLog Makefile.am 
        doc            : omf.make 
        server         : Makefile.am 

Log message:
        applied patch by Patrice Dumas <address@hidden>
        
        * Makefile.am: gui and plugin unconditionnaly in DIST_SUBDIRS.
        * server/Makefile.am: distribute fn_call.h.
        * doc/omf.make: don't use -p $(scrollkeeper_localstate_dir) such
        that nothing is installed in the staged install directory.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/ChangeLog.diff?tr1=1.369&tr2=1.370&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/Makefile.am.diff?tr1=1.23&tr2=1.24&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/doc/omf.make.diff?tr1=1.10&tr2=1.11&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/server/Makefile.am.diff?tr1=1.44&tr2=1.45&r1=text&r2=text

Patches:
Index: gnash/ChangeLog
diff -u gnash/ChangeLog:1.369 gnash/ChangeLog:1.370
--- gnash/ChangeLog:1.369       Mon May 22 18:23:06 2006
+++ gnash/ChangeLog     Tue May 23 07:59:21 2006
@@ -1,3 +1,10 @@
+2006-05-23 Patrice Dumas <address@hidden>
+
+       * Makefile.am: gui and plugin unconditionnaly in DIST_SUBDIRS.
+       * server/Makefile.am: distribute fn_call.h.
+       * doc/omf.make: don't use -p $(scrollkeeper_localstate_dir) such
+       that nothing is installed in the staged install directory.
+
 2006-05-22 Sandro Santilli <address@hidden>
 
        * gui/sdl.cpp: fixed bug in SDL gui preventing movie advances.
Index: gnash/Makefile.am
diff -u gnash/Makefile.am:1.23 gnash/Makefile.am:1.24
--- gnash/Makefile.am:1.23      Thu May 18 16:42:52 2006
+++ gnash/Makefile.am   Tue May 23 07:59:21 2006
@@ -50,7 +50,7 @@
 SUBDIRS      = $(STD_DIRS) $(DOC_DIRS) $(PLUGIN_DIRS)
 
 # libamf isn't used yet, but we still want it in the distribution
-DIST_SUBDIRS = $(STD_DIRS) doc testsuite libamf
+DIST_SUBDIRS = $(STD_DIRS) doc testsuite libamf plugin gui
 
 #EXTRA_DIST = macros
 # if HTTP
Index: gnash/doc/omf.make
diff -u gnash/doc/omf.make:1.10 gnash/doc/omf.make:1.11
--- gnash/doc/omf.make:1.10     Thu May 18 07:40:20 2006
+++ gnash/doc/omf.make  Tue May 23 07:59:21 2006
@@ -42,11 +42,11 @@
        for file in $(omffile); do \
          $(INSTALL_DATA) $$file.out $(DESTDIR)$(omf_dest_dir)/$$file; \
        done
-       -$(SCROLLUPDATE) -v -p $(scrollkeeper_localstate_dir) -o 
$(DESTDIR)$(omf_dest_dir)
+       -$(SCROLLUPDATE) -v -o $(DESTDIR)$(omf_dest_dir)
 
 uninstall-omf-hook:
        -for file in $(omffile); do \
            $(RM) $(DESTDIR)$(omf_dest_dir)/$$file; \
        done
        -rmdir $(DESTDIR)$(omf_dest_dir)
-       -$(SCROLLUPDATE) -v -p $(scrollkeeper_localstate_dir)
+       -$(SCROLLUPDATE) -v 
Index: gnash/server/Makefile.am
diff -u gnash/server/Makefile.am:1.44 gnash/server/Makefile.am:1.45
--- gnash/server/Makefile.am:1.44       Fri May 19 18:09:03 2006
+++ gnash/server/Makefile.am    Tue May 23 07:59:21 2006
@@ -226,7 +226,8 @@
        swf/ASHandlers.h \
        swf/TagLoadersTable.h \
        swf/tag_loaders.h \
-       xmlsocket.h
+       xmlsocket.h \
+       fn_call.h
 
 libgnashserver_la_LIBADD = \
        libgnashasobjs.la \