[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Gnash-commit] gnash ./ChangeLog ./Makefile.in ./configure lib...
|
From: |
Rob Savoye |
|
Subject: |
[Gnash-commit] gnash ./ChangeLog ./Makefile.in ./configure lib... |
|
Date: |
Wed, 21 Dec 2005 02:16:45 +0000 |
CVSROOT: /sources/gnash
Module name: gnash
Branch:
Changes by: Rob Savoye <address@hidden> 05/12/21 02:16:45
Modified files:
. : ChangeLog Makefile.in configure
libbase : Makefile.am Makefile.in
libgeometry : Makefile.am Makefile.in
plugin : plugin.cpp
plugin/mozilla-sdk: Makefile.am Makefile.in
server : Makefile.am Makefile.in
Log message:
* libbase/Makefile.am, libgeometry/Makefile.am,
server/Makefile.am: Don't install the headers.
* plugin/mozilla-sdk/Makefile.am: Install the SDK library.
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/ChangeLog.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/Makefile.in.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/configure.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/libbase/Makefile.am.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/libbase/Makefile.in.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/libgeometry/Makefile.am.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/libgeometry/Makefile.in.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/plugin/plugin.cpp.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/plugin/mozilla-sdk/Makefile.am.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/plugin/mozilla-sdk/Makefile.in.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/server/Makefile.am.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/server/Makefile.in.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
Patches:
Index: gnash/ChangeLog
diff -u gnash/ChangeLog:1.2 gnash/ChangeLog:1.3
--- gnash/ChangeLog:1.2 Wed Dec 21 01:19:45 2005
+++ gnash/ChangeLog Wed Dec 21 02:16:44 2005
@@ -1,5 +1,9 @@
2005-12-20 Rob Savoye <address@hidden>
+ * libbase/Makefile.am, libgeometry/Makefile.am,
+ server/Makefile.am: Don't install the headers.
+ * plugin/mozilla-sdk/Makefile.am: Install the SDK library.
+
* doc/C/gnash.xml: Add more content beyond just the command line
arguments. Add a screenshot of the car crash test case.
* configure.ac: Drop the plugin/test directory, it's unused for
Index: gnash/Makefile.in
diff -u gnash/Makefile.in:1.1 gnash/Makefile.in:1.2
--- gnash/Makefile.in:1.1 Tue Dec 20 21:03:23 2005
+++ gnash/Makefile.in Wed Dec 21 02:16:44 2005
@@ -48,9 +48,8 @@
target_triplet = @target@
DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \
$(srcdir)/Makefile.in $(srcdir)/config.h.in \
- $(srcdir)/config.mk.in $(top_srcdir)/configure AUTHORS COPYING \
- ChangeLog INSTALL NEWS config.guess config.sub depcomp \
- install-sh ltmain.sh missing
+ $(top_srcdir)/configure AUTHORS COPYING ChangeLog INSTALL NEWS \
+ config.guess config.sub depcomp install-sh ltmain.sh missing
subdir = .
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/macros/docbook.m4 \
@@ -65,7 +64,7 @@
configure.lineno configure.status.lineno
mkinstalldirs = $(install_sh) -d
CONFIG_HEADER = config.h
-CONFIG_CLEAN_FILES = config.mk
+CONFIG_CLEAN_FILES =
SOURCES =
DIST_SOURCES =
RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
@@ -289,8 +288,6 @@
distclean-hdr:
-rm -f config.h stamp-h1
-config.mk: $(top_builddir)/config.status $(srcdir)/config.mk.in
- cd $(top_builddir) && $(SHELL) ./config.status $@
mostlyclean-libtool:
-rm -f *.lo
@@ -461,7 +458,7 @@
distdir: $(DISTFILES)
$(am__remove_distdir)
mkdir $(distdir)
- $(mkdir_p) $(distdir)/. $(distdir)/macros
+ $(mkdir_p) $(distdir)/macros
@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
list='$(DISTFILES)'; for file in $$list; do \
Index: gnash/configure
diff -u gnash/configure:1.1 gnash/configure:1.2
--- gnash/configure:1.1 Tue Dec 20 21:03:23 2005
+++ gnash/configure Wed Dec 21 02:16:44 2005
@@ -23238,7 +23238,7 @@
-
ac_config_files="$ac_config_files Makefile libbase/Makefile
libgeometry/Makefile server/Makefile backend/Makefile utilities/Makefile
plugin/Makefile plugin/mozilla-sdk/Makefile plugin/test/Makefile
plugin/test/unix/Makefile doc/Makefile doc/C/Makefile config.mk"
+
ac_config_files="$ac_config_files Makefile
libbase/Makefile libgeometry/Makefile server/Makefile backend/Makefile
utilities/Makefile plugin/Makefile plugin/mozilla-sdk/Makefile doc/Makefile
doc/C/Makefile"
cat >confcache <<\_ACEOF
# This file is a shell script that caches the results of configure
# tests run on this system so they can be shared between configure
@@ -23831,11 +23831,8 @@
"utilities/Makefile" ) CONFIG_FILES="$CONFIG_FILES utilities/Makefile" ;;
"plugin/Makefile" ) CONFIG_FILES="$CONFIG_FILES plugin/Makefile" ;;
"plugin/mozilla-sdk/Makefile" ) CONFIG_FILES="$CONFIG_FILES
plugin/mozilla-sdk/Makefile" ;;
- "plugin/test/Makefile" ) CONFIG_FILES="$CONFIG_FILES plugin/test/Makefile" ;;
- "plugin/test/unix/Makefile" ) CONFIG_FILES="$CONFIG_FILES
plugin/test/unix/Makefile" ;;
"doc/Makefile" ) CONFIG_FILES="$CONFIG_FILES doc/Makefile" ;;
"doc/C/Makefile" ) CONFIG_FILES="$CONFIG_FILES doc/C/Makefile" ;;
- "config.mk" ) CONFIG_FILES="$CONFIG_FILES config.mk" ;;
"depfiles" ) CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;;
"config.h" ) CONFIG_HEADERS="$CONFIG_HEADERS config.h" ;;
*) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5
Index: gnash/libbase/Makefile.am
diff -u gnash/libbase/Makefile.am:1.1 gnash/libbase/Makefile.am:1.2
--- gnash/libbase/Makefile.am:1.1 Tue Dec 20 20:57:00 2005
+++ gnash/libbase/Makefile.am Wed Dec 21 02:16:44 2005
@@ -58,7 +58,7 @@
utility.cpp \
zlib_adapter.cpp
-include_HEADERS = \
+noinst_HEADERS = \
config.h \
container.h \
cschema.h \
Index: gnash/libbase/Makefile.in
diff -u gnash/libbase/Makefile.in:1.1 gnash/libbase/Makefile.in:1.2
--- gnash/libbase/Makefile.in:1.1 Tue Dec 20 20:57:00 2005
+++ gnash/libbase/Makefile.in Wed Dec 21 02:16:44 2005
@@ -59,7 +59,7 @@
host_triplet = @host@
target_triplet = @target@
subdir = libbase
-DIST_COMMON = $(include_HEADERS) $(srcdir)/Makefile.am \
+DIST_COMMON = $(noinst_HEADERS) $(srcdir)/Makefile.am \
$(srcdir)/Makefile.in
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/macros/docbook.m4 \
@@ -79,7 +79,7 @@
*) f=$$p;; \
esac;
am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
-am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(includedir)"
+am__installdirs = "$(DESTDIR)$(libdir)"
libLTLIBRARIES_INSTALL = $(INSTALL)
LTLIBRARIES = $(lib_LTLIBRARIES)
libbase_la_LIBADD =
@@ -110,8 +110,7 @@
$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
SOURCES = $(libbase_la_SOURCES)
DIST_SOURCES = $(libbase_la_SOURCES)
-includeHEADERS_INSTALL = $(INSTALL_HEADER)
-HEADERS = $(include_HEADERS)
+HEADERS = $(noinst_HEADERS)
ETAGS = etags
CTAGS = ctags
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
@@ -292,7 +291,7 @@
utility.cpp \
zlib_adapter.cpp
-include_HEADERS = \
+noinst_HEADERS = \
config.h \
container.h \
cschema.h \
@@ -526,7 +525,7 @@
check: check-am
all-am: Makefile $(LTLIBRARIES) $(HEADERS)
installdirs:
- for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(includedir)"; do \
+ for dir in "$(DESTDIR)$(libdir)"; do \
test -z "$$dir" || $(mkdir_p) "$$dir"; \
done
install: install-am
@@ -574,7 +573,7 @@
info-am:
-install-data-am: install-includeHEADERS
+install-data-am:
install-exec-am: install-libLTLIBRARIES
@@ -602,21 +601,19 @@
ps-am:
-uninstall-am: uninstall-includeHEADERS uninstall-info-am \
- uninstall-libLTLIBRARIES
+uninstall-am: uninstall-info-am uninstall-libLTLIBRARIES
.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
clean-libLTLIBRARIES clean-libtool ctags distclean \
distclean-compile distclean-generic distclean-libtool \
distclean-tags distdir dvi dvi-am html html-am info info-am \
install install-am install-data install-data-am install-exec \
- install-exec-am install-includeHEADERS install-info \
- install-info-am install-libLTLIBRARIES install-man \
- install-strip installcheck installcheck-am installdirs \
- maintainer-clean maintainer-clean-generic mostlyclean \
- mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
- pdf pdf-am ps ps-am tags uninstall uninstall-am \
- uninstall-includeHEADERS uninstall-info-am \
+ install-exec-am install-info install-info-am \
+ install-libLTLIBRARIES install-man install-strip installcheck \
+ installcheck-am installdirs maintainer-clean \
+ maintainer-clean-generic mostlyclean mostlyclean-compile \
+ mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
+ tags uninstall uninstall-am uninstall-info-am \
uninstall-libLTLIBRARIES
Index: gnash/libgeometry/Makefile.am
diff -u gnash/libgeometry/Makefile.am:1.1 gnash/libgeometry/Makefile.am:1.2
--- gnash/libgeometry/Makefile.am:1.1 Tue Dec 20 20:57:00 2005
+++ gnash/libgeometry/Makefile.am Wed Dec 21 02:16:45 2005
@@ -47,7 +47,7 @@
kd_tree_packed.cpp \
tqt.cpp
-include_HEADERS = \
+noinst_HEADERS = \
axial_box.h \
bsp.h \
collision.h \
Index: gnash/libgeometry/Makefile.in
diff -u gnash/libgeometry/Makefile.in:1.1 gnash/libgeometry/Makefile.in:1.2
--- gnash/libgeometry/Makefile.in:1.1 Tue Dec 20 20:57:00 2005
+++ gnash/libgeometry/Makefile.in Wed Dec 21 02:16:45 2005
@@ -59,7 +59,7 @@
host_triplet = @host@
target_triplet = @target@
subdir = libgeometry
-DIST_COMMON = $(include_HEADERS) $(srcdir)/Makefile.am \
+DIST_COMMON = $(noinst_HEADERS) $(srcdir)/Makefile.am \
$(srcdir)/Makefile.in
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/macros/docbook.m4 \
@@ -79,7 +79,7 @@
*) f=$$p;; \
esac;
am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
-am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(includedir)"
+am__installdirs = "$(DESTDIR)$(libdir)"
libLTLIBRARIES_INSTALL = $(INSTALL)
LTLIBRARIES = $(lib_LTLIBRARIES)
libgeometry_la_LIBADD =
@@ -99,8 +99,7 @@
$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
SOURCES = $(libgeometry_la_SOURCES)
DIST_SOURCES = $(libgeometry_la_SOURCES)
-includeHEADERS_INSTALL = $(INSTALL_HEADER)
-HEADERS = $(include_HEADERS)
+HEADERS = $(noinst_HEADERS)
ETAGS = etags
CTAGS = ctags
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
@@ -270,7 +269,7 @@
kd_tree_packed.cpp \
tqt.cpp
-include_HEADERS = \
+noinst_HEADERS = \
axial_box.h \
bsp.h \
collision.h \
@@ -452,7 +451,7 @@
check: check-am
all-am: Makefile $(LTLIBRARIES) $(HEADERS)
installdirs:
- for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(includedir)"; do \
+ for dir in "$(DESTDIR)$(libdir)"; do \
test -z "$$dir" || $(mkdir_p) "$$dir"; \
done
install: install-am
@@ -500,7 +499,7 @@
info-am:
-install-data-am: install-includeHEADERS
+install-data-am:
install-exec-am: install-libLTLIBRARIES
@@ -528,21 +527,19 @@
ps-am:
-uninstall-am: uninstall-includeHEADERS uninstall-info-am \
- uninstall-libLTLIBRARIES
+uninstall-am: uninstall-info-am uninstall-libLTLIBRARIES
.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
clean-libLTLIBRARIES clean-libtool ctags distclean \
distclean-compile distclean-generic distclean-libtool \
distclean-tags distdir dvi dvi-am html html-am info info-am \
install install-am install-data install-data-am install-exec \
- install-exec-am install-includeHEADERS install-info \
- install-info-am install-libLTLIBRARIES install-man \
- install-strip installcheck installcheck-am installdirs \
- maintainer-clean maintainer-clean-generic mostlyclean \
- mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
- pdf pdf-am ps ps-am tags uninstall uninstall-am \
- uninstall-includeHEADERS uninstall-info-am \
+ install-exec-am install-info install-info-am \
+ install-libLTLIBRARIES install-man install-strip installcheck \
+ installcheck-am installdirs maintainer-clean \
+ maintainer-clean-generic mostlyclean mostlyclean-compile \
+ mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
+ tags uninstall uninstall-am uninstall-info-am \
uninstall-libLTLIBRARIES
Index: gnash/plugin/mozilla-sdk/Makefile.am
diff -u gnash/plugin/mozilla-sdk/Makefile.am:1.1
gnash/plugin/mozilla-sdk/Makefile.am:1.2
--- gnash/plugin/mozilla-sdk/Makefile.am:1.1 Tue Dec 20 20:55:12 2005
+++ gnash/plugin/mozilla-sdk/Makefile.am Wed Dec 21 02:16:45 2005
@@ -19,6 +19,8 @@
AUTOMAKE_OPTIONS = dejagnu
+sdkdir = $(FIREFOX_PLUGINS)
+
INCLUDES = -I.. \
-I$(srcdir) \
$(FIREFOX_CFLAGS)
@@ -27,9 +29,15 @@
AM_CPPFLAGS = -Wall -DPLUGIN_TRACE -DXP_UNIX $(FIREFOX_DEFS)
# AM_LDFLAGS = $(FIREFOX_LIBS)
-noinst_LTLIBRARIES = libmozsdk.la
+sdk_LTLIBRARIES = libmozsdk.la
noinst_HEADERS = npplat.h pluginbase.h
libmozsdk_la_SOURCES = \
npn_gate.cpp \
npp_gate.cpp \
np_entry.cpp
+
+install-sdkLTLIBRARIES: $(sdk_LIBRARIES)
+ cp .libs/libmozsdk.so $(sdkdir)/libgnash.so
+
+uninstall-sdkLTLIBRARIES: $(sdk_LIBRARIES)
+ rm -f $(sdkdir)/libmozsdk.so
Index: gnash/plugin/mozilla-sdk/Makefile.in
diff -u gnash/plugin/mozilla-sdk/Makefile.in:1.1
gnash/plugin/mozilla-sdk/Makefile.in:1.2
--- gnash/plugin/mozilla-sdk/Makefile.in:1.1 Tue Dec 20 20:55:12 2005
+++ gnash/plugin/mozilla-sdk/Makefile.in Wed Dec 21 02:16:45 2005
@@ -73,7 +73,15 @@
mkinstalldirs = $(install_sh) -d
CONFIG_HEADER = $(top_builddir)/config.h
CONFIG_CLEAN_FILES =
-LTLIBRARIES = $(noinst_LTLIBRARIES)
+am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+am__vpath_adj = case $$p in \
+ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+ *) f=$$p;; \
+ esac;
+am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
+am__installdirs = "$(DESTDIR)$(sdkdir)"
+sdkLTLIBRARIES_INSTALL = $(INSTALL)
+LTLIBRARIES = $(sdk_LTLIBRARIES)
libmozsdk_la_LIBADD =
am_libmozsdk_la_OBJECTS = npn_gate.lo npp_gate.lo np_entry.lo
libmozsdk_la_OBJECTS = $(am_libmozsdk_la_OBJECTS)
@@ -238,6 +246,7 @@
target_os = @target_os@
target_vendor = @target_vendor@
AUTOMAKE_OPTIONS = dejagnu
+sdkdir = $(FIREFOX_PLUGINS)
INCLUDES = -I.. \
-I$(srcdir) \
$(FIREFOX_CFLAGS)
@@ -245,7 +254,7 @@
AM_CXXFLAGS = $(CFLAGS) $(INCLUDES)
AM_CPPFLAGS = -Wall -DPLUGIN_TRACE -DXP_UNIX $(FIREFOX_DEFS)
# AM_LDFLAGS = $(FIREFOX_LIBS)
-noinst_LTLIBRARIES = libmozsdk.la
+sdk_LTLIBRARIES = libmozsdk.la
noinst_HEADERS = npplat.h pluginbase.h
libmozsdk_la_SOURCES = \
npn_gate.cpp \
@@ -286,16 +295,16 @@
$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-clean-noinstLTLIBRARIES:
- -test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES)
- @list='$(noinst_LTLIBRARIES)'; for p in $$list; do \
+clean-sdkLTLIBRARIES:
+ -test -z "$(sdk_LTLIBRARIES)" || rm -f $(sdk_LTLIBRARIES)
+ @list='$(sdk_LTLIBRARIES)'; for p in $$list; do \
dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
test "$$dir" != "$$p" || dir=.; \
echo "rm -f \"$${dir}/so_locations\""; \
rm -f "$${dir}/so_locations"; \
done
libmozsdk.la: $(libmozsdk_la_OBJECTS) $(libmozsdk_la_DEPENDENCIES)
- $(CXXLINK) $(libmozsdk_la_LDFLAGS) $(libmozsdk_la_OBJECTS)
$(libmozsdk_la_LIBADD) $(LIBS)
+ $(CXXLINK) -rpath $(sdkdir) $(libmozsdk_la_LDFLAGS)
$(libmozsdk_la_OBJECTS) $(libmozsdk_la_LIBADD) $(LIBS)
mostlyclean-compile:
-rm -f *.$(OBJEXT)
@@ -454,6 +463,9 @@
check: check-am
all-am: Makefile $(LTLIBRARIES) $(HEADERS)
installdirs:
+ for dir in "$(DESTDIR)$(sdkdir)"; do \
+ test -z "$$dir" || $(mkdir_p) "$$dir"; \
+ done
install: install-am
install-exec: install-exec-am
install-data: install-data-am
@@ -480,7 +492,7 @@
@echo "it deletes files that may require special tools to rebuild."
clean: clean-am
-clean-am: clean-generic clean-libtool clean-noinstLTLIBRARIES \
+clean-am: clean-generic clean-libtool clean-sdkLTLIBRARIES \
mostlyclean-am
distclean: distclean-am
@@ -499,7 +511,7 @@
info-am:
-install-data-am:
+install-data-am: install-sdkLTLIBRARIES
install-exec-am:
@@ -527,20 +539,28 @@
ps-am:
-uninstall-am: uninstall-info-am
+uninstall-am: uninstall-info-am uninstall-sdkLTLIBRARIES
.PHONY: CTAGS GTAGS all all-am check check-DEJAGNU check-am clean \
- clean-generic clean-libtool clean-noinstLTLIBRARIES ctags \
+ clean-generic clean-libtool clean-sdkLTLIBRARIES ctags \
distclean distclean-DEJAGNU distclean-compile \
distclean-generic distclean-libtool distclean-tags distdir dvi \
dvi-am html html-am info info-am install install-am \
install-data install-data-am install-exec install-exec-am \
- install-info install-info-am install-man install-strip \
- installcheck installcheck-am installdirs maintainer-clean \
+ install-info install-info-am install-man \
+ install-sdkLTLIBRARIES install-strip installcheck \
+ installcheck-am installdirs maintainer-clean \
maintainer-clean-generic mostlyclean mostlyclean-compile \
mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
- tags uninstall uninstall-am uninstall-info-am
+ tags uninstall uninstall-am uninstall-info-am \
+ uninstall-sdkLTLIBRARIES
+
+
+install-sdkLTLIBRARIES: $(sdk_LIBRARIES)
+ cp .libs/libmozsdk.so $(sdkdir)/libgnash.so
+uninstall-sdkLTLIBRARIES: $(sdk_LIBRARIES)
+ rm -f $(sdkdir)/libmozsdk.so
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
.NOEXPORT:
Index: gnash/plugin/plugin.cpp
diff -u gnash/plugin/plugin.cpp:1.1 gnash/plugin/plugin.cpp:1.2
--- gnash/plugin/plugin.cpp:1.1 Tue Dec 20 20:55:12 2005
+++ gnash/plugin/plugin.cpp Wed Dec 21 02:16:45 2005
@@ -36,10 +36,6 @@
#include <X11/Sunkeysym.h>
#include <SDL.h>
-#ifdef USE_GLUT
-// The number of our GLUT window
-int window;
-#else // use SDL instead
// This is our SDL surface
SDL_Surface *surface;
#define SCREEN_WIDTH 640
@@ -51,7 +47,6 @@
int drawGLScene(GLvoid);
int resizeWindow(int width, int height);
void handleKeyPress(SDL_keysym *keysym);
-#endif
// lighting on/off (1 = on, 0 = off)
bool light;
Index: gnash/server/Makefile.am
diff -u gnash/server/Makefile.am:1.1 gnash/server/Makefile.am:1.2
--- gnash/server/Makefile.am:1.1 Tue Dec 20 21:01:18 2005
+++ gnash/server/Makefile.am Wed Dec 21 02:16:45 2005
@@ -58,7 +58,7 @@
text.cpp \
types.cpp
-include_HEADERS = \
+noinst_HEADERS = \
action.h \
button.h \
dlist.h \
Index: gnash/server/Makefile.in
diff -u gnash/server/Makefile.in:1.1 gnash/server/Makefile.in:1.2
--- gnash/server/Makefile.in:1.1 Tue Dec 20 21:01:18 2005
+++ gnash/server/Makefile.in Wed Dec 21 02:16:45 2005
@@ -59,7 +59,7 @@
host_triplet = @host@
target_triplet = @target@
subdir = server
-DIST_COMMON = README $(include_HEADERS) $(srcdir)/Makefile.am \
+DIST_COMMON = README $(noinst_HEADERS) $(srcdir)/Makefile.am \
$(srcdir)/Makefile.in TODO
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/macros/docbook.m4 \
@@ -79,7 +79,7 @@
*) f=$$p;; \
esac;
am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
-am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(includedir)"
+am__installdirs = "$(DESTDIR)$(libdir)"
libLTLIBRARIES_INSTALL = $(INSTALL)
LTLIBRARIES = $(lib_LTLIBRARIES)
libserver_la_LIBADD =
@@ -101,8 +101,7 @@
$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
SOURCES = $(libserver_la_SOURCES)
DIST_SOURCES = $(libserver_la_SOURCES)
-includeHEADERS_INSTALL = $(INSTALL_HEADER)
-HEADERS = $(include_HEADERS)
+HEADERS = $(noinst_HEADERS)
ETAGS = etags
CTAGS = ctags
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
@@ -283,7 +282,7 @@
text.cpp \
types.cpp
-include_HEADERS = \
+noinst_HEADERS = \
action.h \
button.h \
dlist.h \
@@ -493,7 +492,7 @@
check: check-am
all-am: Makefile $(LTLIBRARIES) $(HEADERS)
installdirs:
- for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(includedir)"; do \
+ for dir in "$(DESTDIR)$(libdir)"; do \
test -z "$$dir" || $(mkdir_p) "$$dir"; \
done
install: install-am
@@ -541,7 +540,7 @@
info-am:
-install-data-am: install-includeHEADERS
+install-data-am:
install-exec-am: install-libLTLIBRARIES
@@ -569,21 +568,19 @@
ps-am:
-uninstall-am: uninstall-includeHEADERS uninstall-info-am \
- uninstall-libLTLIBRARIES
+uninstall-am: uninstall-info-am uninstall-libLTLIBRARIES
.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
clean-libLTLIBRARIES clean-libtool ctags distclean \
distclean-compile distclean-generic distclean-libtool \
distclean-tags distdir dvi dvi-am html html-am info info-am \
install install-am install-data install-data-am install-exec \
- install-exec-am install-includeHEADERS install-info \
- install-info-am install-libLTLIBRARIES install-man \
- install-strip installcheck installcheck-am installdirs \
- maintainer-clean maintainer-clean-generic mostlyclean \
- mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
- pdf pdf-am ps ps-am tags uninstall uninstall-am \
- uninstall-includeHEADERS uninstall-info-am \
+ install-exec-am install-info install-info-am \
+ install-libLTLIBRARIES install-man install-strip installcheck \
+ installcheck-am installdirs maintainer-clean \
+ maintainer-clean-generic mostlyclean mostlyclean-compile \
+ mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
+ tags uninstall uninstall-am uninstall-info-am \
uninstall-libLTLIBRARIES
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Gnash-commit] gnash ./ChangeLog ./Makefile.in ./configure lib...,
Rob Savoye <=