[Gnash-commit] [SCM] Gnash branch, master, updated. f246e6c3049c46af379a21290a1391fb876591bf

[Sandro Santilli]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Gnash".

The branch, master has been updated
       via  f246e6c3049c46af379a21290a1391fb876591bf (commit)
      from  fa25110f10b040fd98eb4752b0621fc176656e79 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://git.savannah.gnu.org/cgit//commit/?id=f246e6c3049c46af379a21290a1391fb876591bf


commit f246e6c3049c46af379a21290a1391fb876591bf
Author: Sandro Santilli <address@hidden>
Date:   Fri Oct 22 16:39:22 2010 +0200

    Only build input devices when building the FB gui

diff --git a/gui/Makefile.am b/gui/Makefile.am
index dd79c73..9dffc5e 100644
--- a/gui/Makefile.am
+++ b/gui/Makefile.am
@@ -204,28 +204,6 @@ gnash: gnash.in
        cp $< $@
        chmod +x $@
 
-# These are used to handle input events from a keyboard, mouse, or
-# touchscreen. These are only used by the Framebuffer GUI, as without
-# X11, it has no event handling. We do it this way so the optionally
-# built source files still get included in the source tarball.
-DEVICES =
-if ENABLE_INPUT_DEVICES
-DEVICES += InputDevice.cpp InputDevice.h
-
-# Touchscreen
-if ENABLE_TSLIB
-DEVICES += TouchDevice.cpp
-endif
-# PS/2 Mouse
-if ENABLE_MOUSE
-DEVICES += MouseDevice.cpp
-endif
-# Linux input events
-if ENABLE_INPUT_EVENTS
-DEVICES += EventDevice.cpp
-endif
-endif
-
 # Always include the device files in the source tarball
 EXTRA_DIST += \
        TouchDevice.cpp \
@@ -236,7 +214,6 @@ GUI_SRCS = gnash.cpp \
        gui.cpp gui.h \
        Player.cpp Player.h \
        NullGui.cpp NullGui.h \
-       $(DEVICES) \
        $(NULL)
 
 if BUILD_AQUA_GUI
diff --git a/gui/fb/fb.am b/gui/fb/fb.am
index 01580f2..31ef349 100644
--- a/gui/fb/fb.am
+++ b/gui/fb/fb.am
@@ -15,12 +15,35 @@
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 # 
 
+
+# These are used to handle input events from a keyboard, mouse, or
+# touchscreen. These are only used by the Framebuffer GUI, as without
+# X11, it has no event handling. We do it this way so the optionally
+# built source files still get included in the source tarball.
+DEVICES =
+if ENABLE_INPUT_DEVICES
+DEVICES += InputDevice.cpp InputDevice.h
+
+# Touchscreen
+if ENABLE_TSLIB
+DEVICES += TouchDevice.cpp
+endif
+# PS/2 Mouse
+if ENABLE_MOUSE
+DEVICES += MouseDevice.cpp
+endif
+# Linux input events
+if ENABLE_INPUT_EVENTS
+DEVICES += EventDevice.cpp
+endif
+endif
+
 #
 # Build the FB gui
 #
 if BUILD_FB_GUI
 bin_PROGRAMS += fb-gnash
-fb_gnash_SOURCES = $(GUI_SRCS) fb/gui_fb.cpp fb/fb.cpp fb/fbsup.h
+fb_gnash_SOURCES = $(GUI_SRCS) $(DEVICES) fb/gui_fb.cpp fb/fb.cpp fb/fbsup.h
 fb_gnash_CPPFLAGS = -DGUI_FB -DGUI_CONFIG=\"FB\" -DFAKEFB=\"$(FAKEFB)\" \
        $(AM_CPPFLAGS) 
 fb_gnash_LDFLAGS = $(LIBLTDL) -export-dynamic $(AM_LDFLAGS)

-----------------------------------------------------------------------

Summary of changes:
 gui/Makefile.am |   23 -----------------------
 gui/fb/fb.am    |   25 ++++++++++++++++++++++++-
 2 files changed, 24 insertions(+), 24 deletions(-)


hooks/post-receive
-- 
Gnash