CVSROOT: /sources/gnash
Module name: gnash
Changes by: Rob Savoye <rsavoye> 07/11/28 22:39:10
Modified files:
gui : Makefile.am
. : ChangeLog
Added files:
gui/am-frag : alp.am aqua.am fb.am fltk.am gtk.am hildon.am
kde.am qtopia.am riscos.am sdl.am
Log message:
* gui/am-frag: Automake include files to make the top level
gui/makefile.am less huge. It also makes it much cleaner for
when
you have to add a new GUI target.
* gui/Makefile.am: Include Automake stubs if specified by the
build.
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/gui/Makefile.am?cvsroot=gnash&r1=1.112&r2=1.113
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.5000&r2=1.5001
http://cvs.savannah.gnu.org/viewcvs/gnash/gui/am-frag/alp.am?cvsroot=gnash&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/gnash/gui/am-frag/aqua.am?cvsroot=gnash&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/gnash/gui/am-frag/fb.am?cvsroot=gnash&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/gnash/gui/am-frag/fltk.am?cvsroot=gnash&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/gnash/gui/am-frag/gtk.am?cvsroot=gnash&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/gnash/gui/am-frag/hildon.am?cvsroot=gnash&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/gnash/gui/am-frag/kde.am?cvsroot=gnash&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/gnash/gui/am-frag/qtopia.am?cvsroot=gnash&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/gnash/gui/am-frag/riscos.am?cvsroot=gnash&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/gnash/gui/am-frag/sdl.am?cvsroot=gnash&rev=1.1
Patches:
Index: gui/Makefile.am
===================================================================
RCS file: /sources/gnash/gnash/gui/Makefile.am,v
retrieving revision 1.112
retrieving revision 1.113
diff -u -b -r1.112 -r1.113
--- gui/Makefile.am 26 Nov 2007 11:33:18 -0000 1.112
+++ gui/Makefile.am 28 Nov 2007 22:39:08 -0000 1.113
@@ -178,239 +178,60 @@
EXTRA_DIST += Gnash.app
endif
-#
+# Build the QTOPIA gui
+if BUILD_QTOPIA_GUI
+include $(srcdir)/am-frag/qtopia.am
+endif
+
# Build the KDE gui
-#
if BUILD_KDE_GUI
-bin_PROGRAMS += kde-gnash
-kde_gnash_CPPFLAGS = -DGUI_KDE -DGUI_CONFIG=\"KDE\" \
- $(AM_CPPFLAGS) $(KDE_CFLAGS) $(QT_CFLAGS)
-kde_gnash_SOURCES = $(GUI_SRCS) gui_kde.cpp
-kde_gnash_LDFLAGS = $(LIBLTDL) -export-dynamic
-#kde_gnash_DEPENDENCIES = .configline
-kde_gnash_LDADD = \
- $(MYSQL_LIBS) \
- $(GNASH_LIBS) \
- $(AM_LDFLAGS)
-if BUILD_OGL_RENDERER
-kde_gnash_CPPFLAGS += $(OPENGL_CFLAGS)
-kde_gnash_LDADD += $(top_builddir)/backend/libgnashogl.la \
- $(KDE_LIBS) $(QT_LIBS) $(OPENGL_LIBS)
-kde_gnash_SOURCES += kde_glue_opengl.cpp kde_glue_opengl.h kde_glue.h \
- kde.cpp kdesup.h kde_glue.h
-endif
-if BUILD_AGG_RENDERER
-kde_gnash_CPPFLAGS += $(AGG_CFLAGS)
-kde_gnash_LDADD += $(top_builddir)/backend/libgnashagg.la \
- $(KDE_LIBS) $(QT_LIBS) $(AGG_LIBS)
-kde_gnash_SOURCES += kde_glue_agg.cpp kde_glue_agg.h \
- kde.cpp kdesup.h kde_glue.h
-endif
+include $(srcdir)/am-frag/kde.am
endif
-#
# Build the SDL gui
-#
if BUILD_SDL_GUI
-bin_PROGRAMS += sdl-gnash
-sdl_gnash_CPPFLAGS = -DGUI_SDL -DGUI_CONFIG=\"SDL\" \
- $(AM_CPPFLAGS) $(SDL_CFLAGS)
-sdl_gnash_SOURCES = $(GUI_SRCS) gui_sdl.cpp sdl.cpp sdlsup.h sdl_glue.h
-sdl_gnash_LDFLAGS = $(LIBLTDL) -export-dynamic
-#sdl_gnash_DEPENDENCIES = .configline
-sdl_gnash_LDADD = \
- $(MYSQL_LIBS) \
- $(GNASH_LIBS) \
- $(AM_LDFLAGS) \
- $(SDL_LIBS)
-
-if BUILD_OGL_RENDERER
-sdl_gnash_CPPFLAGS += $(OPENGL_CFLAGS)
-sdl_gnash_LDADD += $(top_builddir)/backend/libgnashogl.la \
- $(OPENGL_LIBS)
-sdl_gnash_SOURCES += sdl_ogl_glue.cpp sdl_ogl_glue.h
-endif
-
-if BUILD_AGG_RENDERER
-sdl_gnash_CPPFLAGS += $(AGG_CFLAGS)
-sdl_gnash_LDADD += $(top_builddir)/backend/libgnashagg.la \
- $(AGG_LIBS)
-sdl_gnash_SOURCES += sdl_agg_glue.cpp sdl_agg_glue.h
+include $(srcdir)/am-frag/sdl.am
endif
-if BUILD_CAIRO_RENDERER
-sdl_gnash_CPPFLAGS += $(CAIRO_CFLAGS)
-sdl_gnash_LDADD += $(top_builddir)/backend/libgnashcairo.la \
- $(CAIRO_LIBS)
-sdl_gnash_SOURCES += sdl_cairo_glue.cpp sdl_cairo_glue.h
-endif
-endif
-
-#
# Build the FLTK gui
-#
if BUILD_FLTK_GUI
-bin_PROGRAMS += fltk-gnash
-fltk_gnash_CPPFLAGS = -DGUI_FLTK -DGUI_CONFIG=\"FLTK\" \
- $(AM_CPPFLAGS) $(FLTK2_CFLAGS)
-fltk_gnash_SOURCES = $(GUI_SRCS) gui_fltk.cpp
-fltk_gnash_LDFLAGS = $(LIBLTDL) -export-dynamic
-#fltk_gnash_DEPENDENCIES = .configline
-fltk_gnash_LDADD = \
- $(MYSQL_LIBS) \
- $(GNASH_LIBS) \
- $(AM_LDFLAGS)
-# if BUILD_OGL_RENDERER
-# fltk_gnash_CPPFLAGS += $(OPENGL_CFLAGS)
-# fltk_gnash_LDADD += $(top_builddir)/backend/libgnashogl.la
-# $(SDL_LIBS) $(OPENGL_LIBS)
-# fltk_gnash_SOURCES += fltk_glue_ogl.cpp fltk_glue_ogl.h \
-# fltk.cpp fltksup.h
-# endif
-if BUILD_AGG_RENDERER
-fltk_gnash_CPPFLAGS += $(AGG_CFLAGS)
-fltk_gnash_LDADD += $(top_builddir)/backend/libgnashagg.la \
- $(FLTK2_LIBS) $(AGG_LIBS) $(XFT_LIBS) $(X11_LIBS)
-fltk_gnash_SOURCES += fltk_glue_agg.cpp fltk_glue_agg.h \
- fltk.cpp fltksup.h
-endif
+include $(srcdir)/am-frag/fltk.am
endif
-#
# Build the AQUA gui
-#
if BUILD_AQUA_GUI
-bin_PROGRAMS += aqua-gnash
-aqua_gnash_CPPFLAGS = -DGUI_AQUA $(AM_CPPFLAGS) -DGUI_CONFIG=\"AQUA\"
-aqua_gnash_SOURCES = $(GUI_SRCS) gui_aqua.cpp
-aqua_gnash_LDFLAGS = $(LIBLTDL) -export-dynamic
-#aqua_gnash_DEPENDENCIES = .configline
-aqua_gnash_LDADD = \
- $(MYSQL_LIBS) \
- $(GNASH_LIBS) \
- $(AM_LDFLAGS)
-if BUILD_OGL_RENDERER
-aqua_gnash_CPPFLAGS += $(OPENGL_CFLAGS)
-aqua_gnash_LDADD += $(top_builddir)/backend/libgnashogl.la \
- $(AQUA_LIBS) $(OPENGL_LIBS)
-aqua_gnash_SOURCES += aqua_ogl_glue.cpp aqua_ogl_glue.h \
- aqua.cpp aquasup.h aqua_glue.h
-endif
-# if BUILD_AGG_RENDERER
-# aqua_gnash_CPPFLAGS += $(AGG_CFLAGS)
-# aqua_gnash_LDADD += $(top_builddir)/backend/libgnashagg.la \
-# $(AQUA_LIBS) $(AGG_LIBS)
-# aqua_gnash_SOURCES += aqua_agg_glue.cpp aqua_agg_glue.h \
-# aqua.cpp aquasup.h aqua_glue.h
-# endif
+include $(srcdir)/am-frag/aqua.am
endif
-#
# Build the GTK gui
-#
if BUILD_GTK_GUI
-bin_PROGRAMS += gtk-gnash
-gtk_gnash_SOURCES = $(GUI_SRCS) gui_gtk.cpp
-gtk_gnash_CPPFLAGS = -DGUI_GTK -DGUI_CONFIG=\"GTK\" \
- $(AM_CPPFLAGS) $(GTK_CFLAGS)
-gtk_gnash_LDFLAGS = $(LIBLTDL) -export-dynamic $(AM_LDFLAGS)
-#gtk_gnash_DEPENDENCIES = .configline
-
-if BUILD_OGL_RENDERER
-gtk_gnash_CPPFLAGS += $(OPENGL_CFLAGS)
-gtk_gnash_SOURCES += gtk_glue_gtkglext.cpp gtk_glue_gtkglext.h \
- gtk.cpp gtksup.h gtk_glue.h
-gtk_gnash_LDADD = $(top_builddir)/backend/libgnashogl.la \
- $(GNASH_LIBS) $(GTK_LIBS) $(OPENGL_LIBS)
-endif # BUILD_OGL_RENDERER
-if BUILD_AGG_RENDERER
-gtk_gnash_CPPFLAGS += $(AGG_CFLAGS)
-gtk_gnash_SOURCES += gtk_glue_agg.cpp gtk_glue_agg.h \
- gtk.cpp gtksup.h gtk_glue.h
-gtk_gnash_LDADD = $(top_builddir)/backend/libgnashagg.la \
- $(GNASH_LIBS) $(GTK_LIBS) $(AGG_LIBS)
-endif # BUILD_AGG_RENDERER
-if BUILD_CAIRO_RENDERER
-gtk_gnash_CPPFLAGS += $(CAIRO_CFLAGS)
-gtk_gnash_SOURCES += gtk_glue_cairo.cpp gtk_glue_cairo.h \
- gtk.cpp gtksup.h gtk_glue.h
-gtk_gnash_LDADD = $(top_builddir)/backend/libgnashcairo.la \
- $(GNASH_LIBS) $(GTK_LIBS) $(CAIRO_LIBS)
-endif # BUILD_CAIRO_RENDERER
-endif # BUILD_GTK_GUI
+include $(srcdir)/am-frag/gtk.am
+endif
+# if ALP # Access Linux Platform
+# gtk_gnash_LDFLAGS += "-shared -Xlinker -z -Xlinker defs $(GTK2_LIBS)"
+# gtk_gnash_LDADD += $(ALP_LIBS)
+# endif
#
+# Build the GTK/ALP gui
+if BUILD_ALP_GUI
+include $(srcdir)/am-frag/alp.am
+endif
+
# Build the GTK/HILDON gui
-#
if BUILD_HILDON_GUI
-bin_PROGRAMS += hildon-gnash
-hildon_gnash_SOURCES = $(GUI_SRCS) gui_gtk.cpp
-hildon_gnash_CPPFLAGS = -DGUI_GTK -DGUI_HILDON -DGUI_CONFIG=\"HILDON\" \
- $(AM_CPPFLAGS) $(GTK_CFLAGS) $(HILDON_CFLAGS)
-hildon_gnash_LDFLAGS = $(LIBLTDL) -export-dynamic $(AM_LDFLAGS)
-#gtk_gnash_DEPENDENCIES = .configline
-
-if BUILD_OGL_RENDERER
-hildon_gnash_CPPFLAGS += $(OPENGL_CFLAGS)
-hildon_gnash_SOURCES += gtk_glue_gtkglext.cpp gtk_glue_gtkglext.h \
- gtk.cpp gtksup.h gtk_glue.h
-hildon_gnash_LDADD = $(top_builddir)/backend/libgnashogl.la \
- $(GNASH_LIBS) $(GTK_LIBS) $(OPENGL_LIBS) $(HILDON_LIBS)
-endif # BUILD_OGL_RENDERER
-if BUILD_AGG_RENDERER
-hildon_gnash_CPPFLAGS += $(AGG_CFLAGS) $(HILDON_CFLAGS)
-hildon_gnash_SOURCES += gtk_glue_agg.cpp gtk_glue_agg.h \
- gtk.cpp gtksup.h gtk_glue.h
-hildon_gnash_LDADD = $(top_builddir)/backend/libgnashagg.la \
- $(GNASH_LIBS) $(GTK_LIBS) $(AGG_LIBS) $(HILDON_LIBS)
-
-endif # BUILD_AGG_RENDERER
-if BUILD_CAIRO_RENDERER
-hildon_gnash_CPPFLAGS += $(CAIRO_CFLAGS)
-hildon_gnash_SOURCES += gtk_glue_cairo.cpp gtk_glue_cairo.h \
- gtk.cpp gtksup.h gtk_glue.h
-hildon_gnash_LDADD = $(top_builddir)/backend/libgnashcairo.la \
- $(GNASH_LIBS) $(GTK_LIBS) $(CAIRO_LIBS) $(HILDON_LIBS)
-endif # BUILD_CAIRO_RENDERER
-endif # BUILD_GTK_HILDON
+include $(srcdir)/am-frag/hildon.am
+endif
-#
# Build the FB gui
-#
if BUILD_FB_GUI
-bin_PROGRAMS += fb-gnash
-fb_gnash_SOURCES = $(GUI_SRCS) gui_fb.cpp fb.cpp fbsup.h
-fb_gnash_CPPFLAGS = -DGUI_FB -DGUI_CONFIG=\"FB\" \
- $(AM_CPPFLAGS)
-fb_gnash_LDFLAGS = $(LIBLTDL) -export-dynamic $(AM_LDFLAGS)
-#fb_gnash_DEPENDENCIES = .configline
-
-if BUILD_AGG_RENDERER
-fb_gnash_CPPFLAGS += $(AGG_CFLAGS)
-fb_gnash_SOURCES +=
-fb_gnash_LDADD = $(top_builddir)/backend/libgnashagg.la \
- $(GNASH_LIBS) $(AGG_LIBS)
-endif # BUILD_AGG_RENDERER
-endif # BUILD_FB_GUI
+include $(srcdir)/am-frag/fb.am
+endif
-#
# Build the RISCOS gui
-#
if BUILD_RISCOS_GUI
-bin_PROGRAMS += riscos-gnash
-riscos_gnash_SOURCES = $(GUI_SRCS) gui_riscos.cpp riscos.cpp riscos_glue.h
riscossup.h
-riscos_gnash_CPPFLAGS = -DGUI_FB -DGUI_CONFIG=\"FB\" \
- $(AM_CPPFLAGS)
-riscos_gnash_LDFLAGS = $(LIBLTDL) -export-dynamic $(AM_LDFLAGS)
-#riscos_gnash_DEPENDENCIES = .configline
-
-if BUILD_AGG_RENDERER
-riscos_gnash_CPPFLAGS += $(AGG_CFLAGS)
-riscos_gnash_SOURCES += riscos_glue_agg.cpp riscos_glue_agg.h
-riscos_gnash_LDADD = $(top_builddir)/backend/libgnashagg.la \
- $(GNASH_LIBS) $(AGG_LIBS)
-endif # BUILD_AGG_RENDERER
-endif # BUILD_FB_GUI
+include $(srcdir)/am-frag/riscos.am
+endif
CLEANFILES = klash.moc .configline gnash
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.5000
retrieving revision 1.5001
diff -u -b -r1.5000 -r1.5001
--- ChangeLog 28 Nov 2007 22:28:53 -0000 1.5000
+++ ChangeLog 28 Nov 2007 22:39:09 -0000 1.5001
@@ -1,5 +1,11 @@
2007-11-28 Rob Savoye <[EMAIL PROTECTED]>
+ * gui/am-frag: Automake include files to make the top level
+ gui/makefile.am less huge. It also makes it much cleaner for when
+ you have to add a new GUI target.
+ * gui/Makefile.am: Include Automake stubs if specified by the
+ build.
+
* macros/qt.m4: New file. originally pulled from kde.m4, but then
modified heavily to use QTDIR correctly, and to handle multiple
differing versions of QT APIs. For now the default is to use Qt3
Index: gui/am-frag/alp.am
===================================================================
RCS file: gui/am-frag/alp.am
diff -N gui/am-frag/alp.am
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ gui/am-frag/alp.am 28 Nov 2007 22:39:09 -0000 1.1
@@ -0,0 +1,191 @@
+# if ALP # Access Linux Platform
+# gtk_gnash_LDFLAGS += "-shared -Xlinker -z -Xlinker defs $(GTK2_LIBS)"
+# gtk_gnash_LDADD += $(ALP_LIBS)
+# endif
+#
+# Build the GTK/ALP gui
+#
+if BUILD_ALP_GUI
+bin_PROGRAMS += alp-gnash
+alp_gnash_SOURCES = $(GUI_SRCS) gui_gtk.cpp
+alp_gnash_CPPFLAGS = -DGUI_GTK -DGUI_ALP -DGUI_CONFIG=\"ALP\" \
+ $(AM_CPPFLAGS) $(GTK_CFLAGS) $(ALP_CFLAGS)
+alp_gnash_LDFLAGS = $(LIBLTDL) -export-dynamic $(AM_LDFLAGS)
+#gtk_gnash_DEPENDENCIES = .configline
+
+if BUILD_OGL_RENDERER
+alp_gnash_CPPFLAGS += $(OPENGL_CFLAGS)
+alp_gnash_SOURCES += gtk_glue_gtkglext.cpp gtk_glue_gtkglext.h \
+ gtk.cpp gtksup.h gtk_glue.h
+alp_gnash_LDADD = $(top_builddir)/backend/libgnashogl.la \
+ $(GNASH_LIBS) $(GTK_LIBS) $(OPENGL_LIBS) $(ALP_LIBS)
+endif # BUILD_OGL_RENDERER
+if BUILD_AGG_RENDERER
+alp_gnash_CPPFLAGS += $(AGG_CFLAGS)
+alp_gnash_SOURCES += gtk_glue_agg.cpp gtk_glue_agg.h \
+ gtk.cpp gtksup.h gtk_glue.h
+alp_gnash_LDADD = $(top_builddir)/backend/libgnashagg.la \
+ $(GNASH_LIBS) $(GTK_LIBS) $(AGG_LIBS) $(ALP_LIBS)
+
+endif # BUILD_AGG_RENDERER
+if BUILD_CAIRO_RENDERER
+alp_gnash_CPPFLAGS += $(CAIRO_CFLAGS)
+alp_gnash_SOURCES += gtk_glue_cairo.cpp gtk_glue_cairo.h \
+ gtk.cpp gtksup.h gtk_glue.h
+alp_gnash_LDADD = $(top_builddir)/backend/libgnashcairo.la \
+ $(GNASH_LIBS) $(GTK_LIBS) $(CAIRO_LIBS) $(ALP_LIBS)
+endif # BUILD_CAIRO_RENDERER
+
+# networking related info
+NETCAT_REMOTE = netcat -q 10 `cat /tmp/alp.ip` 5038
+NETCAT_REMOTE_Q = netcat -q 8 `cat /tmp/alp.ip` 5038
+UML_IP = 192.168.3.101
+REMOTE_IP = 192.168.1.101
+ALP_NAMESPACE = org.gnu.gnash
+ALP_BUNDLE_DIR = /opt/alp/bundles/
+
+# ALP_SECURITY - For building signed bundles you need to set this
+# variable to 1. The default is set to 0
+ALP_SECURITY = 0
+
+# CERTIFICATE and KEY - Specify the certificate and key files for signing.
+# The default is to look for files 'certificate' and 'key' in
+# the local dir then search up through the parent dirs
+CERTIFICATE = certificate
+KEY = key
+PASS = accesstest
+
+# where does built stuff go?
+BUILD_DIR := build/$(SBOX)
+# Bundle names
+# where to construct bundle hierarchy (e.g. obj/sbox/com.foo.apps.name)
+SRC_BND_DIR := $(BUILD_DIR)/$(BND_NAME)
+# Extract the bundle name directly from the Manifest file.
+BND_NAMES := gnash
+BND_NAME := $(word 1, $(BND_NAMES))
+TARGET_NAME := $(word 2, $(BND_NAMES))
+
+# install location for bundle hierarchy (for install/install-files targets)
+# Check to see if there is a "bundles" directory. If there is,
+# use it. Otherwise, revert to using the "packages" directory.
+DEST_BND_ROOT := /opt/alp/bundles
+DEST_BND_DIR := $(DEST_BND_ROOT)/$(BND_NAME)
+
+# Bar files
+# (if BAR_DIR not defined, assume bar files go in build/sbox)
+# (BAR_DIR may need to be created so we can't rely solely on BAR_TARGET)
+# (may be defined by build-all Makefile to collect .bar files in one place)
+BAR_NAME = $(BND_NAME).bar
+BAR_TARGET = $(BUILD_DIR)/$(BAR_NAME)
+BAR_DIR = $(BAR_DIR)/$(SBOX)
+
+# i486 means UML target, else assume REMOTE_IP refers to ARM
+# Sign the bundle
+#ifeq ($(ALP_SECURITY),1)
+$(SIGN_TARGET): $(CERTIFICATE) $(KEY)
+ @echo [$(TARGET_NAME)] Sign $@
+ $(DO_ECHO)$(SIGN) $(SRC_BND_DIR) $^ $(PASS) $(TARGET_NAME)
+#endif
+
+alp-ip:
+ if test ! -f /tmp/alp.ip; then \
+ if test "`uname -m`" = "i486" -a "`uname -m`" = "i686" ; then \
+ echo "$(UML_IP)" | cut -d ' ' -f1 > /tmp/alp.ip ; \
+ else \
+ echo "$(REMOTE_IP)" | cut -d ' ' -f1 > /tmp/alp.ip ; \
+ fi ; \
+ fi
+
+alp-bundle: libgnashalp.la
+ $(mkinstalldirs) $(ALP_NAMESPACE)/rsc
+ echo $(srcdir)/Manifest.xml $(ALP_NAMESPACE)/
+ cp -f $(srcdir)/Manifest.xml $(ALP_NAMESPACE)/
+ @if test -f libgnash.so; then \
+ cp -vf libgnashalp.so $(ALP_NAMESPACE)/; \
+ else \
+ cp -vf .libs/libgnashalp.so $(ALP_NAMESPACE)/; \
+ fi
+ cp -f $(top_srcdir)/gui/images/GnashGTiny.png $(ALP_NAMESPACE)/rsc/
+ cp -f $(top_srcdir)/gui/images/gravity.swf $(ALP_NAMESPACE)/rsc/
+
+bar: alp-bundle # signed $(BUNDLE_TARGETS) $(SIGN_TARGET)
+ $(BARTENDER) pack $(ALP_NAMESPACE) $(ALP_NAMESPACE).bar
+# cp $(BAR_TARGET) $(BAR_DIR)
+
+# install-alp: alp-ip alp-bundle install-files
+# echo "I think I'm installing"
+# (echo "install $(ALP_NAMESPACE).hello.bar `ls -la
$(ALP_NAMESPACE).hello.bar | cut -d ' ' -f 6,6` 0 0 0755" ; cat
$(ALP_NAMESPACE).bar ) | $(NETCAT_REMOTE)
+# @echo; echo "Registering new bar file with target..."
+# @echo 'package install $(ALP_NAMESPACE).bar' | $(NETCAT_REMOTE)
+# @echo " "
+
+# (echo "install /tmp/$(ALP_NAMESPACE).hello.bar `/scratchbox/tools/bin/ls -la
buil
+# d/alp-simulator/$(ALP_NAMESPACE).hello.bar | /scratchbox/tools/bin/cut
--delim='
+# ' --fields=6,6` 0 0 0755" ; /scratchbox/tools/bin/cat
build/alp-simulator/com.ac
+# cess.apps.hello.bar ) | netcat -q 10 `cat /tmp/alp.ip` 5038
+install-alp: bar install-files # launcher uninstall
+ @echo "Installing new bar file..."
+ size=`ls -la $(ALP_NAMESPACE).bar | cut --delim=' ' --fields=6,6`; \
+ (echo "install $(ALP_NAMESPACE).bar $$size 0 0 0755" ; cat
$(ALP_NAMESPACE).bar ) | $(NETCAT_REMOTE)
+ @echo; echo "Registering new bar file with target..."
+ @echo 'package install /tmp/$(ALP_NAMESPACE).bar' | $(NETCAT_REMOTE)
+ @echo " "
+
+launch:
+ @echo 'package run bar:$(ALP_NAMESPACE)' | $(NETCAT_REMOTE)
+
+# Note: bundle delete requires rdbgd version 11
+# uninstall-alp:
+# @echo 'package delete bar:$(ALP_NAMESPACE)' | $(NETCAT_REMOTE)
+# -if test -e $(DEST_BND_DIR)/Manifest.xml ; then \
+# rm -Rf $(DEST_BND_DIR) ; \
+# fi
+#############
+# install-files - Install built files into current rootfs
+# (DO NOT USE if target is running; does not interact with target)
+#############
+
+install-files: alp-bundle
+ $(mkinstalldirs) $(DEST_BND_ROOT)/$(ALP_NAMESPACE)
+# -if [ -e $(DEST_BND_DIR)/Manifest.xml ] ; then \
+# echo " " ; \
+# echo "Bundle already exists! Removing old bundle..." ; \
+# rm -Rf $(DEST_BND_DIR) ; \
+# fi
+ @echo "Installing new bundle files..."
+ cp -Rf $(ALP_NAMESPACE) $(DEST_BND_ROOT)
+
+#############
+# uninstall-files - Uninstall built files from current rootfs
+# (DO NOT USE if target is running; does not interact with target)
+#############
+
+uninstall-files:
+ @echo " "
+ -if [ -e $(DEST_BND_DIR)/Manifest.xml ] ; then \
+ echo "Removing old bundle... (NOTE: target should NOT be running!)" ;
\
+ rm -Rf $(DEST_BND_DIR) ; \
+ else \
+ echo "Manifest.xml not found in $(DEST_BND_DIR)" ; \
+ echo "If the directory exists, you'll need to remove it manually." ; \
+ fi
+ @echo " "
+
+###########
+# uninstall - uninstall app from remote target (using "bundle delete")
+# (depends on netcat instead of rdbgd since it works w/o target)
+###########
+
+uninstall-alp: uninstall-files
+ @# Note: bundle delete requires rdbgd version 11
+ @echo " "
+ @echo "Removing old bundle..."
+ @echo "(If this returns an error, the target is probably not running.)"
+ @echo "(In that case, the bundle should be gone when you next boot the
target.)"
+ @echo " "
+ [EMAIL PROTECTED] 'package delete bar:$(ALP_NAMESPACE)' |
$(NETCAT_REMOTE)
+ @echo " "
+ @# explicitly remove the bundle directory in case the rdbgd command
fails.
+
+endif
+
Index: gui/am-frag/aqua.am
===================================================================
RCS file: gui/am-frag/aqua.am
diff -N gui/am-frag/aqua.am
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ gui/am-frag/aqua.am 28 Nov 2007 22:39:09 -0000 1.1
@@ -0,0 +1,28 @@
+#
+# Build the AQUA gui
+#
+if BUILD_AQUA_GUI
+bin_PROGRAMS += aqua-gnash
+aqua_gnash_CPPFLAGS = -DGUI_AQUA $(AM_CPPFLAGS) -DGUI_CONFIG=\"AQUA\"
+aqua_gnash_SOURCES = $(GUI_SRCS) gui_aqua.cpp
+aqua_gnash_LDFLAGS = $(LIBLTDL) -export-dynamic
+#aqua_gnash_DEPENDENCIES = .configline
+aqua_gnash_LDADD = \
+ $(MYSQL_LIBS) \
+ $(GNASH_LIBS) \
+ $(AM_LDFLAGS)
+if BUILD_OGL_RENDERER
+aqua_gnash_CPPFLAGS += $(OPENGL_CFLAGS)
+aqua_gnash_LDADD += $(top_builddir)/backend/libgnashogl.la \
+ $(AQUA_LIBS) $(OPENGL_LIBS)
+aqua_gnash_SOURCES += aqua_ogl_glue.cpp aqua_ogl_glue.h \
+ aqua.cpp aquasup.h aqua_glue.h
+endif
+# if BUILD_AGG_RENDERER
+# aqua_gnash_CPPFLAGS += $(AGG_CFLAGS)
+# aqua_gnash_LDADD += $(top_builddir)/backend/libgnashagg.la \
+# $(AQUA_LIBS) $(AGG_LIBS)
+# aqua_gnash_SOURCES += aqua_agg_glue.cpp aqua_agg_glue.h \
+# aqua.cpp aquasup.h aqua_glue.h
+# endif
+endif
Index: gui/am-frag/fb.am
===================================================================
RCS file: gui/am-frag/fb.am
diff -N gui/am-frag/fb.am
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ gui/am-frag/fb.am 28 Nov 2007 22:39:09 -0000 1.1
@@ -0,0 +1,19 @@
+#
+# Build the FB gui
+#
+if BUILD_FB_GUI
+bin_PROGRAMS += fb-gnash
+fb_gnash_SOURCES = $(GUI_SRCS) gui_fb.cpp fb.cpp fbsup.h
+fb_gnash_CPPFLAGS = -DGUI_FB -DGUI_CONFIG=\"FB\" \
+ $(AM_CPPFLAGS)
+fb_gnash_LDFLAGS = $(LIBLTDL) -export-dynamic $(AM_LDFLAGS)
+#fb_gnash_DEPENDENCIES = .configline
+
+if BUILD_AGG_RENDERER
+fb_gnash_CPPFLAGS += $(AGG_CFLAGS)
+fb_gnash_SOURCES +=
+fb_gnash_LDADD = $(top_builddir)/backend/libgnashagg.la \
+ $(GNASH_LIBS) $(AGG_LIBS)
+endif # BUILD_AGG_RENDERER
+endif # BUILD_FB_GUI
+
Index: gui/am-frag/fltk.am
===================================================================
RCS file: gui/am-frag/fltk.am
diff -N gui/am-frag/fltk.am
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ gui/am-frag/fltk.am 28 Nov 2007 22:39:09 -0000 1.1
@@ -0,0 +1,29 @@
+#
+# Build the FLTK gui
+#
+if BUILD_FLTK_GUI
+bin_PROGRAMS += fltk-gnash
+fltk_gnash_CPPFLAGS = -DGUI_FLTK -DGUI_CONFIG=\"FLTK\" \
+ $(AM_CPPFLAGS) $(FLTK2_CFLAGS)
+fltk_gnash_SOURCES = $(GUI_SRCS) gui_fltk.cpp
+fltk_gnash_LDFLAGS = $(LIBLTDL) -export-dynamic
+#fltk_gnash_DEPENDENCIES = .configline
+fltk_gnash_LDADD = \
+ $(MYSQL_LIBS) \
+ $(GNASH_LIBS) \
+ $(AM_LDFLAGS)
+# if BUILD_OGL_RENDERER
+# fltk_gnash_CPPFLAGS += $(OPENGL_CFLAGS)
+# fltk_gnash_LDADD += $(top_builddir)/backend/libgnashogl.la
+# $(SDL_LIBS) $(OPENGL_LIBS)
+# fltk_gnash_SOURCES += fltk_glue_ogl.cpp fltk_glue_ogl.h \
+# fltk.cpp fltksup.h
+# endif
+if BUILD_AGG_RENDERER
+fltk_gnash_CPPFLAGS += $(AGG_CFLAGS)
+fltk_gnash_LDADD += $(top_builddir)/backend/libgnashagg.la \
+ $(FLTK2_LIBS) $(AGG_LIBS) $(XFT_LIBS) $(X11_LIBS)
+fltk_gnash_SOURCES += fltk_glue_agg.cpp fltk_glue_agg.h \
+ fltk.cpp fltksup.h
+endif
+endif
Index: gui/am-frag/gtk.am
===================================================================
RCS file: gui/am-frag/gtk.am
diff -N gui/am-frag/gtk.am
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ gui/am-frag/gtk.am 28 Nov 2007 22:39:09 -0000 1.1
@@ -0,0 +1,33 @@
+#
+# Build the GTK gui
+#
+if BUILD_GTK_GUI
+bin_PROGRAMS += gtk-gnash
+gtk_gnash_SOURCES = $(GUI_SRCS) gui_gtk.cpp
+gtk_gnash_CPPFLAGS = -DGUI_GTK -DGUI_CONFIG=\"GTK\" \
+ $(AM_CPPFLAGS) $(GTK_CFLAGS)
+gtk_gnash_LDFLAGS = $(LIBLTDL) -export-dynamic $(AM_LDFLAGS)
+#gtk_gnash_DEPENDENCIES = .configline
+
+if BUILD_OGL_RENDERER
+gtk_gnash_CPPFLAGS += $(OPENGL_CFLAGS)
+gtk_gnash_SOURCES += gtk_glue_gtkglext.cpp gtk_glue_gtkglext.h \
+ gtk.cpp gtksup.h gtk_glue.h
+gtk_gnash_LDADD = $(top_builddir)/backend/libgnashogl.la \
+ $(GNASH_LIBS) $(GTK_LIBS) $(OPENGL_LIBS)
+endif # BUILD_OGL_RENDERER
+if BUILD_AGG_RENDERER
+gtk_gnash_CPPFLAGS += $(AGG_CFLAGS)
+gtk_gnash_SOURCES += gtk_glue_agg.cpp gtk_glue_agg.h \
+ gtk.cpp gtksup.h gtk_glue.h
+gtk_gnash_LDADD = $(top_builddir)/backend/libgnashagg.la \
+ $(GNASH_LIBS) $(GTK_LIBS) $(AGG_LIBS)
+endif # BUILD_AGG_RENDERER
+if BUILD_CAIRO_RENDERER
+gtk_gnash_CPPFLAGS += $(CAIRO_CFLAGS)
+gtk_gnash_SOURCES += gtk_glue_cairo.cpp gtk_glue_cairo.h \
+ gtk.cpp gtksup.h gtk_glue.h
+gtk_gnash_LDADD = $(top_builddir)/backend/libgnashcairo.la \
+ $(GNASH_LIBS) $(GTK_LIBS) $(CAIRO_LIBS)
+endif # BUILD_CAIRO_RENDERER
+endif # BUILD_GTK_GUI
Index: gui/am-frag/hildon.am
===================================================================
RCS file: gui/am-frag/hildon.am
diff -N gui/am-frag/hildon.am
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ gui/am-frag/hildon.am 28 Nov 2007 22:39:09 -0000 1.1
@@ -0,0 +1,69 @@
+#
+# Build the GTK/HILDON gui
+#
+if BUILD_HILDON_GUI
+bin_PROGRAMS += hildon-gnash
+hildon_gnash_SOURCES = $(GUI_SRCS) gui_gtk.cpp
+hildon_gnash_CPPFLAGS = -DGUI_GTK -DGUI_HILDON -DGUI_CONFIG=\"HILDON\" \
+ $(AM_CPPFLAGS) $(GTK_CFLAGS) $(HILDON_CFLAGS)
+hildon_gnash_LDFLAGS = $(LIBLTDL) -export-dynamic $(AM_LDFLAGS)
+#gtk_gnash_DEPENDENCIES = .configline
+
+if BUILD_OGL_RENDERER
+hildon_gnash_CPPFLAGS += $(OPENGL_CFLAGS)
+hildon_gnash_SOURCES += gtk_glue_gtkglext.cpp gtk_glue_gtkglext.h \
+ gtk.cpp gtksup.h gtk_glue.h
+hildon_gnash_LDADD = $(top_builddir)/backend/libgnashogl.la \
+ $(GNASH_LIBS) $(GTK_LIBS) $(OPENGL_LIBS) $(HILDON_LIBS)
+endif # BUILD_OGL_RENDERER
+if BUILD_AGG_RENDERER
+hildon_gnash_CPPFLAGS += $(AGG_CFLAGS) $(HILDON_CFLAGS)
+hildon_gnash_SOURCES += gtk_glue_agg.cpp gtk_glue_agg.h \
+ gtk.cpp gtksup.h gtk_glue.h
+hildon_gnash_LDADD = $(top_builddir)/backend/libgnashagg.la \
+ $(GNASH_LIBS) $(GTK_LIBS) $(AGG_LIBS) $(HILDON_LIBS)
+
+endif # BUILD_AGG_RENDERER
+if BUILD_CAIRO_RENDERER
+hildon_gnash_CPPFLAGS += $(CAIRO_CFLAGS)
+hildon_gnash_SOURCES += gtk_glue_cairo.cpp gtk_glue_cairo.h \
+ gtk.cpp gtksup.h gtk_glue.h
+hildon_gnash_LDADD = $(top_builddir)/backend/libgnashcairo.la \
+ $(GNASH_LIBS) $(GTK_LIBS) $(CAIRO_LIBS) $(HILDON_LIBS)
+endif # BUILD_CAIRO_RENDERER
+endif # BUILD_GTK_HILDON
+
+# #
+# # Build the GTK/HILDON gui
+# #
+# if BUILD_HILDON_GUI
+# bin_PROGRAMS += hildon-gnash
+# hildon_gnash_SOURCES = $(GUI_SRCS) gui_gtk.cpp
+# hildon_gnash_CPPFLAGS = -DGUI_GTK -DGUI_HILDON -DGUI_CONFIG=\"HILDON\" \
+# $(AM_CPPFLAGS) $(GTK_CFLAGS) $(HILDON_CFLAGS)
+# hildon_gnash_LDFLAGS = $(LIBLTDL) -export-dynamic $(AM_LDFLAGS)
+# #gtk_gnash_DEPENDENCIES = .configline
+
+# if BUILD_OGL_RENDERER
+# hildon_gnash_CPPFLAGS += $(OPENGL_CFLAGS)
+# hildon_gnash_SOURCES += gtk_glue_gtkglext.cpp gtk_glue_gtkglext.h \
+# gtk.cpp gtksup.h gtk_glue.h
+# hildon_gnash_LDADD = $(top_builddir)/backend/libgnashogl.la \
+# $(GNASH_LIBS) $(GTK_LIBS) $(OPENGL_LIBS) $(HILDON_LIBS)
+# endif # BUILD_OGL_RENDERER
+# if BUILD_AGG_RENDERER
+# hildon_gnash_CPPFLAGS += $(AGG_CFLAGS) $(HILDON_CFLAGS)
+# hildon_gnash_SOURCES += gtk_glue_agg.cpp gtk_glue_agg.h \
+# gtk.cpp gtksup.h gtk_glue.h
+# hildon_gnash_LDADD = $(top_builddir)/backend/libgnashagg.la \
+# $(GNASH_LIBS) $(GTK_LIBS) $(AGG_LIBS) $(HILDON_LIBS)
+
+# endif # BUILD_AGG_RENDERER
+# if BUILD_CAIRO_RENDERER
+# hildon_gnash_CPPFLAGS += $(CAIRO_CFLAGS)
+# hildon_gnash_SOURCES += gtk_glue_cairo.cpp gtk_glue_cairo.h \
+# gtk.cpp gtksup.h gtk_glue.h
+# hildon_gnash_LDADD = $(top_builddir)/backend/libgnashcairo.la \
+# $(GNASH_LIBS) $(GTK_LIBS) $(CAIRO_LIBS) $(HILDON_LIBS)
+# endif # BUILD_CAIRO_RENDERER
+# endif # BUILD_GTK_HILDON
Index: gui/am-frag/kde.am
===================================================================
RCS file: gui/am-frag/kde.am
diff -N gui/am-frag/kde.am
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ gui/am-frag/kde.am 28 Nov 2007 22:39:09 -0000 1.1
@@ -0,0 +1,32 @@
+#
+# Build the KDE gui
+#
+if BUILD_KDE_GUI
+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_SOURCES = $(GUI_SRCS) gui_kde.cpp
+kde_gnash_LDFLAGS = $(LIBLTDL) -export-dynamic
+#kde_gnash_DEPENDENCIES = .configline
+kde_gnash_LDADD = \
+ $(MYSQL_LIBS) \
+ $(GNASH_LIBS) \
+ $(AM_LDFLAGS)
+if BUILD_OGL_RENDERER
+kde_gnash_CPPFLAGS += $(OPENGL_CFLAGS)
+kde_gnash_LDADD += $(top_builddir)/backend/libgnashogl.la \
+ $(KDE_LIBS) $(QT_LIBS) $(OPENGL_LIBS)
+kde_gnash_SOURCES += kde_glue_opengl.cpp kde_glue_opengl.h kde_glue.h \
+ kde.cpp kdesup.h kde_glue.h
+endif
+if BUILD_AGG_RENDERER
+kde_gnash_CPPFLAGS += $(AGG_CFLAGS)
+kde_gnash_LDADD += $(top_builddir)/backend/libgnashagg.la \
+ $(KDE_LIBS) $(QT_LIBS) $(AGG_LIBS)
+kde_gnash_SOURCES += kde_glue_agg.cpp kde_glue_agg.h \
+ kde.cpp kdesup.h kde_glue.h
+endif
+endif
Index: gui/am-frag/qtopia.am
===================================================================
RCS file: gui/am-frag/qtopia.am
diff -N gui/am-frag/qtopia.am
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ gui/am-frag/qtopia.am 28 Nov 2007 22:39:10 -0000 1.1
@@ -0,0 +1,30 @@
+#
+# Build the QTOPIA gui
+#
+if BUILD_QTOPIA_GUI
+bin_PROGRAMS += qtopia-gnash
+qtopia_gnash_CPPFLAGS = -DGUI_QTOPIA -DGUI_CONFIG=\"QTOPIA\" \
+ $(AM_CPPFLAGS) $(KDE_CFLAGS) $(QT_CFLAGS)
+qtopia_gnash_SOURCES = $(GUI_SRCS) gui_kde.cpp
+qtopia_gnash_LDFLAGS = $(LIBLTDL) -export-dynamic
+#qtopia_gnash_DEPENDENCIES = .configline
+qtopia_gnash_LDADD = \
+ $(MYSQL_LIBS) \
+ $(GNASH_LIBS) \
+ $(AM_LDFLAGS)
+if BUILD_OGL_RENDERER
+qtopia_gnash_CPPFLAGS += $(OPENGL_CFLAGS)
+qtopia_gnash_LDADD += $(top_builddir)/backend/libgnashogl.la \
+ $(KDE_LIBS) $(QTOPIA_LIBS) $(QT_LIBS) $(OPENGL_LIBS)
+qtopia_gnash_SOURCES += kde_glue_opengl.cpp kde_glue_opengl.h kde_glue.h \
+ kde.cpp kdesup.h kde_glue.h
+endif
+if BUILD_AGG_RENDERER
+qtopia_gnash_CPPFLAGS += $(AGG_CFLAGS)
+qtopia_gnash_LDADD += $(top_builddir)/backend/libgnashagg.la \
+ $(KDE_LIBS) $(QTOPIA_LIBS) $(QT_LIBS) $(AGG_LIBS)
+qtopia_gnash_SOURCES += kde_glue_agg.cpp kde_glue_agg.h \
+ kde.cpp kdesup.h kde_glue.h
+endif
+endif
+
Index: gui/am-frag/riscos.am
===================================================================
RCS file: gui/am-frag/riscos.am
diff -N gui/am-frag/riscos.am
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ gui/am-frag/riscos.am 28 Nov 2007 22:39:10 -0000 1.1
@@ -0,0 +1,19 @@
+
+#
+# Build the RISCOS gui
+#
+if BUILD_RISCOS_GUI
+bin_PROGRAMS += riscos-gnash
+riscos_gnash_SOURCES = $(GUI_SRCS) gui_riscos.cpp riscos.cpp riscos_glue.h
riscossup.h
+riscos_gnash_CPPFLAGS = -DGUI_FB -DGUI_CONFIG=\"FB\" \
+ $(AM_CPPFLAGS)
+riscos_gnash_LDFLAGS = $(LIBLTDL) -export-dynamic $(AM_LDFLAGS)
+#riscos_gnash_DEPENDENCIES = .configline
+
+if BUILD_AGG_RENDERER
+riscos_gnash_CPPFLAGS += $(AGG_CFLAGS)
+riscos_gnash_SOURCES += riscos_glue_agg.cpp riscos_glue_agg.h
+riscos_gnash_LDADD = $(top_builddir)/backend/libgnashagg.la \
+ $(GNASH_LIBS) $(AGG_LIBS)
+endif # BUILD_AGG_RENDERER
+endif # BUILD_FB_GUI
Index: gui/am-frag/sdl.am
===================================================================
RCS file: gui/am-frag/sdl.am
diff -N gui/am-frag/sdl.am
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ gui/am-frag/sdl.am 28 Nov 2007 22:39:10 -0000 1.1
@@ -0,0 +1,37 @@
+#
+# Build the SDL gui
+#
+if BUILD_SDL_GUI
+bin_PROGRAMS += sdl-gnash
+sdl_gnash_CPPFLAGS = -DGUI_SDL -DGUI_CONFIG=\"SDL\" \
+ $(AM_CPPFLAGS) $(SDL_CFLAGS)
+sdl_gnash_SOURCES = $(GUI_SRCS) gui_sdl.cpp sdl.cpp sdlsup.h sdl_glue.h
+sdl_gnash_LDFLAGS = $(LIBLTDL) -export-dynamic
+#sdl_gnash_DEPENDENCIES = .configline
+sdl_gnash_LDADD = \
+ $(MYSQL_LIBS) \
+ $(GNASH_LIBS) \
+ $(AM_LDFLAGS) \
+ $(SDL_LIBS)
+
+if BUILD_OGL_RENDERER
+sdl_gnash_CPPFLAGS += $(OPENGL_CFLAGS)
+sdl_gnash_LDADD += $(top_builddir)/backend/libgnashogl.la \
+ $(OPENGL_LIBS)
+sdl_gnash_SOURCES += sdl_ogl_glue.cpp sdl_ogl_glue.h
+endif
+
+if BUILD_AGG_RENDERER
+sdl_gnash_CPPFLAGS += $(AGG_CFLAGS)
+sdl_gnash_LDADD += $(top_builddir)/backend/libgnashagg.la \
+ $(AGG_LIBS)
+sdl_gnash_SOURCES += sdl_agg_glue.cpp sdl_agg_glue.h
+endif
+
+if BUILD_CAIRO_RENDERER
+sdl_gnash_CPPFLAGS += $(CAIRO_CFLAGS)
+sdl_gnash_LDADD += $(top_builddir)/backend/libgnashcairo.la \
+ $(CAIRO_LIBS)
+sdl_gnash_SOURCES += sdl_cairo_glue.cpp sdl_cairo_glue.h
+endif
+endif
_______________________________________________
Gnash-commit mailing list
Gnash-commit@gnu.org
http://lists.gnu.org/mailman/listinfo/gnash-commit
