[prev in list] [next in list] [prev in thread] [next in thread]
List: gnash-commit
Subject: [Gnash-commit] gnash ./configure.ac ./Makefile.am ./ChangeLog ...
From: Rob Savoye <rob () welcomehome ! org>
Date: 2006-03-31 17:37:19
Message-ID: E1FPNYl-0005I6-Rl () savannah ! gnu ! org
[Download RAW message or body]
CVSROOT: /sources/gnash
Module name: gnash
Branch:
Changes by: Rob Savoye <rsavoye@savannah.gnu.org> 06/03/31 17:37:18
Modified files:
. : configure.ac Makefile.am ChangeLog
doc/C : Makefile.am
plugin/klash : Makefile.am
plugin/mozilla-sdk: Makefile.am
Added files:
plugin/klash : klash_part.moc.in
Log message:
* Makefile.am: Add libamf and plugin to STD_DIRS.
* configure.ac: Call KDE_SET_PREFIX to set KDECONFIG.
* doc/C/Makefile.am: Change the invocation of db2_teximl for
version 0.8.5. Also change the file name the gets renmoved, so
make it part of the conditional test.
* macros/kde.m4: Fix KDE_SET_PREFIX to not trash the value of
$prefix.
* plugin/klash/Makefile.am: Fix how the moc file gets built and as
a dependancy.
* plugin/mozilla-sdk/Makefile.am: Add all the headers to
noinst_HEADERS so makedistcheck works.
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/configure.ac.diff?tr1=1.55&tr2=1.56&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/Makefile.am.diff?tr1=1.16&tr2=1.17&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/ChangeLog.diff?tr1=1.193&tr2=1.194&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/doc/C/Makefile.am.diff?tr1=1.14&tr2=1.15&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/plugin/klash/Makefile.am.diff?tr1=1.4&tr2=1.5&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/plugin/klash/klash_part.moc.in?rev=1.1
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/plugin/mozilla-sdk/Makefile.am.diff?tr1=1.8&tr2=1.9&r1=text&r2=text
Patches:
Index: gnash/ChangeLog
diff -u gnash/ChangeLog:1.193 gnash/ChangeLog:1.194
--- gnash/ChangeLog:1.193 Fri Mar 31 00:57:33 2006
+++ gnash/ChangeLog Fri Mar 31 17:37:18 2006
@@ -1,3 +1,17 @@
+2006-03-31 Rob Savoye <rob@wharfrat.welcomehome.org>
+
+ * Makefile.am: Add libamf and plugin to STD_DIRS.
+ * configure.ac: Call KDE_SET_PREFIX to set KDECONFIG.
+ * doc/C/Makefile.am: Change the invocation of db2_teximl for
+ version 0.8.5. Also change the file name the gets renmoved, so
+ make it part of the conditional test.
+ * macros/kde.m4: Fix KDE_SET_PREFIX to not trash the value of
+ $prefix.
+ * plugin/klash/Makefile.am: Fix how the moc file gets built and as
+ a dependancy.
+ * plugin/mozilla-sdk/Makefile.am: Add all the headers to
+ noinst_HEADERS so makedistcheck works.
+
2006-03-30 Rob Savoye <rob@wharfrat.welcomehome.org>
* plugin/Makefile.am: Pass in the prefix as a constant so we can
Index: gnash/Makefile.am
diff -u gnash/Makefile.am:1.16 gnash/Makefile.am:1.17
--- gnash/Makefile.am:1.16 Thu Mar 9 19:29:05 2006
+++ gnash/Makefile.am Fri Mar 31 17:37:18 2006
@@ -35,20 +35,17 @@
# exception also makes it possible to release a modified version which
# carries forward this exception.
#
-
+
## Process this file with automake to produce Makefile.in
AUTOMAKE_OPTIONS = dejagnu
ACLOCAL_AMFLAGS = -I macros
-STD_DIRS = libbase libgeometry server backend utilities
-# if PLUGIN
-# PLUG_DIR = plugin
-# endif
+STD_DIRS = libbase libgeometry server backend utilities plugin libamf
if DOCBOOK
DOC_DIRS = doc
endif
-SUBDIRS = $(STD_DIRS) plugin $(DOC_DIRS)
-DIST_SUBDIRS = $(STD_DIRS) plugin doc testsuite
+SUBDIRS = $(STD_DIRS) $(DOC_DIRS)
+DIST_SUBDIRS = $(STD_DIRS) doc testsuite
#EXTRA_DIST = macros
# if HTTP
Index: gnash/configure.ac
diff -u gnash/configure.ac:1.55 gnash/configure.ac:1.56
--- gnash/configure.ac:1.55 Fri Mar 31 00:57:33 2006
+++ gnash/configure.ac Fri Mar 31 17:37:18 2006
@@ -56,7 +56,7 @@
AC_ARG_VAR(PKGCONFIGFOUND, [Path to pkg-config])
AC_CHECK_PROG(PKGCONFIGFOUND, pkg-config,[yes])
-dnl KDE_SET_PREFIX
+KDE_SET_PREFIX
AM_KDE_WITH_NLS
AC_PATH_KDE
KDE_USE_QT(3)
Index: gnash/doc/C/Makefile.am
diff -u gnash/doc/C/Makefile.am:1.14 gnash/doc/C/Makefile.am:1.15
--- gnash/doc/C/Makefile.am:1.14 Mon Mar 20 19:54:29 2006
+++ gnash/doc/C/Makefile.am Fri Mar 31 17:37:18 2006
@@ -77,7 +77,7 @@
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
@@ -131,11 +131,13 @@
$(DB2X_XSLTPROC) -s texi $< --output $${basefile}.txml; \
if test x"$(DB2X_VERSION)" = x"0.8.5"; then \
$(DB2X_TEXIXML) $${basefile}.txml; \
- sed -e "s/setfilename $${basefile}_manual_v.*\.info/setfilename \
$${basefile}.texi"; \ + sed -e "s/setfilename \
$${basefile}_manual_v.*\.info/setfilename $${basefile}.info/" $${basefile}.texi; \ + \
basefile=`echo $< | sed -e 's,^.*/,,' -e 's,\.xml$$,,'`; \ + $(RM) \
$${basefile}_manual_v*.texi; \ else \
$(DB2X_TEXIXML) --to-stdout $${basefile}.txml > $${basefile}.texi ; \
+ $(RM) $${basefile}_manual_v*.texi; \
fi
- -$(RM) $${basefile}_manual_v*.texi
else
touch $@
endif
Index: gnash/plugin/klash/Makefile.am
diff -u gnash/plugin/klash/Makefile.am:1.4 gnash/plugin/klash/Makefile.am:1.5
--- gnash/plugin/klash/Makefile.am:1.4 Thu Mar 30 01:52:00 2006
+++ gnash/plugin/klash/Makefile.am Fri Mar 31 17:37:18 2006
@@ -44,10 +44,13 @@
kde_module_LTLIBRARIES= libklashpart.la
-libklashpart_la_SOURCES = klash_part.cpp klash_part.moc
+libklashpart_la_SOURCES = klash_part.cpp klash_part.h
#nodist_libklashpart_la_SOURCES= klash_part.moc
libklashpart_la_LDFLAGS = -avoid-version $(all_libraries) $(KDE_RPATH)
-libklashpart_la_DEPENDANCIES = klash_part.moc
+libklashpart_la_DEPENDENCIES = klash_part.moc
+
+libklashpart.la: $(libklashpart_la_DEPENDENCIES) $(libklashpart_la_OBJECTS)
+ $(CXXLINK) -rpath $(kde_moduledir) $(libklashpart_la_LDFLAGS) \
$(libklashpart_la_OBJECTS) $(libklashpart_la_LIBADD) $(LIBS)
#EXTRA_PROGRAMS = klashplayer
#klashplayer_app = klashplayer
@@ -61,16 +64,16 @@
#xdg_apps_DATA = klash.desktop
-kde_services_DATA = klash_part.desktop
+dist_kde_services_DATA = klash_part.desktop
-rc_DATA = klashpartui.rc
+dist_rc_DATA = klashpartui.rc
rcdir = $(kde_datadir)/klash
-conf_DATA = klashrc
+dist_conf_DATA = klashrc
confdir = $(kde_confdir)
appsdatadir=$(kde_datadir)/klash
-appsdata_DATA= pluginsinfo
+dist_appsdata_DATA= pluginsinfo
CLEANFILES = klash_part.moc
dummy.cpp:
@@ -80,5 +83,11 @@
$(XGETTEXT) *.cpp -o $(podir)/klash.pot
klash_part.moc: $(srcdir)/klash_part.h
- $(MOC) $(srcdir)/klash_part.h -o klash_part.moc
+ @if test x"$(MOC)" != x; then \
+ echo "Generating MOC file..."; \
+ $(MOC) $(srcdir)/klash_part.h -o klash_part.moc; \
+ else \
+ echo "WARNING: Install QT's moc tool! Linking to default MOC file"; \
+ ln -s $(srcdir)/klash_part.moc.in klash_part.moc; \
+ fi
Index: gnash/plugin/mozilla-sdk/Makefile.am
diff -u gnash/plugin/mozilla-sdk/Makefile.am:1.8 \
gnash/plugin/mozilla-sdk/Makefile.am:1.9
--- gnash/plugin/mozilla-sdk/Makefile.am:1.8 Thu Mar 30 01:52:00 2006
+++ gnash/plugin/mozilla-sdk/Makefile.am Fri Mar 31 17:37:18 2006
@@ -30,7 +30,29 @@
# noinst_LTLIBRARIES = libmozsdk.la
lib_LTLIBRARIES = libmozsdk.la
-noinst_HEADERS = npplat.h pluginbase.h
+noinst_HEADERS = npplat.h \
+ pluginbase.h \
+ include/jri.h \
+ include/npapi.h \
+ include/npupp.h \
+ include/prtypes.h \
+ include/jni.h \
+ include/jri_md.h \
+ include/npruntime.h \
+ include/jni_md.h \
+ include/jritypes.h \
+ include/nptypes.h \
+ include/prcpucfg.h \
+ include/prlock.h \
+ include/prcvar.h \
+ include/prthread.h \
+ include/prinit.h \
+ include/prerr.h \
+ include/prerror.h \
+ include/prinrval.h \
+ include/prwin16.h \
+ include/obsolete/protypes.h
+
libmozsdk_la_SOURCES = \
npn_gate.cpp \
npp_gate.cpp \
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic