Author: ajorg
Date: 2007-09-26 14:13:37 -0400 (Wed, 26 Sep 2007)
New Revision: 86424

Modified:
   trunk/moon/ChangeLog
   trunk/moon/Makefile.am
   trunk/moon/gtk/ChangeLog
   trunk/moon/gtk/Makefile.am
   trunk/moon/src/ChangeLog
   trunk/moon/src/Makefile.am
   trunk/moon/tools/mopen/Makefile.am
   trunk/moon/tools/svg2xaml/ChangeLog
   trunk/moon/tools/svg2xaml/Makefile.am
   trunk/moon/tools/xamlg/Makefile.am
Log:
Fixes for make dist and for rpm packaging


Modified: trunk/moon/ChangeLog
===================================================================
--- trunk/moon/ChangeLog        2007-09-26 17:53:51 UTC (rev 86423)
+++ trunk/moon/ChangeLog        2007-09-26 18:13:37 UTC (rev 86424)
@@ -1,3 +1,9 @@
+2007-09-26  Andrew Jorgensen  <[EMAIL PROTECTED]>
+
+       * Makefile.am: Added test/harness to SUBDIRS for dist tarball
+       * tools/xamlg/Makefile.am, tools/mopen/Makefile.am:
+         Added missing files for dist tarball
+
 2007-09-24  Sebastien Pouliot  <[EMAIL PROTECTED]>
 
        * configure.ac: Fix XRANDR support.

Modified: trunk/moon/Makefile.am
===================================================================
--- trunk/moon/Makefile.am      2007-09-26 17:53:51 UTC (rev 86423)
+++ trunk/moon/Makefile.am      2007-09-26 18:13:37 UTC (rev 86424)
@@ -1,4 +1,4 @@
-SUBDIRS = src gtk plugin tools man
+SUBDIRS = src gtk plugin tools man test/harness
 
 pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA=moon.pc

Modified: trunk/moon/gtk/ChangeLog
===================================================================
--- trunk/moon/gtk/ChangeLog    2007-09-26 17:53:51 UTC (rev 86423)
+++ trunk/moon/gtk/ChangeLog    2007-09-26 18:13:37 UTC (rev 86424)
@@ -1,3 +1,7 @@
+2007-09-26  Andrew Jorgensen  <[EMAIL PROTECTED]>
+
+       * Makefile.am: Add $(DESTDIR) to gacutil command for rpm packaging
+
 2007-08-20  Chris Toshok  <[EMAIL PROTECTED]>
 
        * ManagedDownloader.cs: fix this the right way, by keeping the

Modified: trunk/moon/gtk/Makefile.am
===================================================================
--- trunk/moon/gtk/Makefile.am  2007-09-26 17:53:51 UTC (rev 86423)
+++ trunk/moon/gtk/Makefile.am  2007-09-26 18:13:37 UTC (rev 86424)
@@ -26,11 +26,11 @@
        mdassembler --ecma docs/ --out gtksilver
 
 install-data-local:
-       gacutil -gacdir $(prefix) -i gtksilver.dll
+       gacutil -gacdir $(DESTDIR)$(prefix) -i gtksilver.dll
 
 dist-hook:
        mkdir $(distdir)/docs
        -cp $(srcdir)/docs/Gtk.Moonlight.xml $(srcdir)/docs/index.xml 
$(distdir)/docs
 
 push:
-       scp -v gtksilver.tree gtksilver.zip gtksilver.source [EMAIL 
PROTECTED]:/usr/lib/monodoc/sources/
\ No newline at end of file
+       scp -v gtksilver.tree gtksilver.zip gtksilver.source [EMAIL 
PROTECTED]:/usr/lib/monodoc/sources/

Modified: trunk/moon/src/ChangeLog
===================================================================
--- trunk/moon/src/ChangeLog    2007-09-26 17:53:51 UTC (rev 86423)
+++ trunk/moon/src/ChangeLog    2007-09-26 18:13:37 UTC (rev 86424)
@@ -1,3 +1,7 @@
+2007-09-26  Andrew Jorgensen  <[EMAIL PROTECTED]>
+
+       * Makefile.am: Added missing files for dist tarball
+
 2007-09-26  Chris Toshok  <[EMAIL PROTECTED]>
 
        * clock.h, clock.cpp: add some very naive, rather lame fps tuning.

Modified: trunk/moon/src/Makefile.am
===================================================================
--- trunk/moon/src/Makefile.am  2007-09-26 17:53:51 UTC (rev 86423)
+++ trunk/moon/src/Makefile.am  2007-09-26 18:13:37 UTC (rev 86424)
@@ -18,10 +18,12 @@
        canvas.h        \
        clock.h         \
        collection.h    \
+       color.h         \
        control.h       \
        debug.h         \
        dependencyobject.h \
        downloader.h    \
+       enums.h         \
        error.h         \
        font.h          \
        frameworkelement.h \
@@ -34,6 +36,7 @@
        mplayer.h       \
        namescope.h     \
        openfile.h      \
+       panel.h         \
        playlist.h      \
        point.h         \
        rect.h          \
@@ -43,9 +46,11 @@
        stylus.h        \
        text.h          \
        transform.h     \
+       trigger.h       \
        type.h          \
        uielement.h     \
        value.h         \
+       visual.h        \
        xaml.h          \
        libmoon.h
 
@@ -98,9 +103,12 @@
        zip/unzip.h     \
        zip/crypt.h
 
+EXTRA_DIST = \
+       alpha-premul-table.inc \
+       zip/README \
+       zip/ChangeLogUnzip \
+       $(libmooninclude_headers)
 
-EXTRA_DIST = alpha-premul-table.inc zip/README zip/ChangeLogUnzip
-
 demo_SOURCES = \
        demo.cpp
 

Modified: trunk/moon/tools/mopen/Makefile.am
===================================================================
--- trunk/moon/tools/mopen/Makefile.am  2007-09-26 17:53:51 UTC (rev 86423)
+++ trunk/moon/tools/mopen/Makefile.am  2007-09-26 18:13:37 UTC (rev 86424)
@@ -4,7 +4,10 @@
 
 bin_SCRIPTS = mopen
 
-EXTRA_DIST = mopen.in
+EXTRA_DIST = \
+       mopen.in \
+       mopen.exe.config \
+       $(mopen_exe_CS)
 
 CLEANFILES = mopen mopen.exe mopen.exe.mdb
 DISTCLEANFILES=$(CLEANFILES)

Modified: trunk/moon/tools/svg2xaml/ChangeLog
===================================================================
--- trunk/moon/tools/svg2xaml/ChangeLog 2007-09-26 17:53:51 UTC (rev 86423)
+++ trunk/moon/tools/svg2xaml/ChangeLog 2007-09-26 18:13:37 UTC (rev 86424)
@@ -1,3 +1,7 @@
+2007-09-26  Andrew Jorgensen  <[EMAIL PROTECTED]>
+
+       * Makefile.am: Added missing files for dist tarball
+
 2007-06-29  Andreia Gaita  <[EMAIL PROTECTED]>
 
        * svg2xaml.xslt, svg2xaml_standalone.xslt:
@@ -89,4 +93,4 @@
        * svg2xaml_standalone.xslt: initial checkin. 
        Same as svg2xaml.xsl, but doesn't use microsoft
        xslt extensions (node-set), so it can work with
-       other versions of the xslt spec.
\ No newline at end of file
+       other versions of the xslt spec.

Modified: trunk/moon/tools/svg2xaml/Makefile.am
===================================================================
--- trunk/moon/tools/svg2xaml/Makefile.am       2007-09-26 17:53:51 UTC (rev 
86423)
+++ trunk/moon/tools/svg2xaml/Makefile.am       2007-09-26 18:13:37 UTC (rev 
86424)
@@ -4,7 +4,12 @@
 
 moon_DATA = svg2xaml.exe svg2xaml-gui.exe
 
-EXTRA_DIST = svg2xaml.in svg2xaml-gui.in
+EXTRA_DIST = \
+       svg2xaml.in \
+       svg2xaml-gui.in \
+       $(svg2xaml_exe_CS) \
+       $(svg2xaml_gui_exe_CS) \
+       svg2xaml.xslt
 
 CLEANFILES = svg2xaml svg2xaml.exe
 
@@ -33,4 +38,4 @@
        gmcs -debug -out:svg2xaml-gui.exe $(svg2xaml_gui_exe_CS) 
-pkg:gtk-sharp-2.0 -pkg:rsvg-sharp-2.0 -pkg:silverdesktop 
-r:../../gtk/gtksilver.dll -r:Mono.Posix -r:System -r:System.Xml 
-resource:svg2xaml.xslt
 
 run:
-       mono --debug svg2xaml.exe
\ No newline at end of file
+       mono --debug svg2xaml.exe

Modified: trunk/moon/tools/xamlg/Makefile.am
===================================================================
--- trunk/moon/tools/xamlg/Makefile.am  2007-09-26 17:53:51 UTC (rev 86423)
+++ trunk/moon/tools/xamlg/Makefile.am  2007-09-26 18:13:37 UTC (rev 86424)
@@ -4,7 +4,9 @@
 
 moon_DATA = xamlg.exe
 
-EXTRA_DIST = xamlg.in
+EXTRA_DIST = \
+       xamlg.in \
+       $(xamlg_exe_CS)
 
 CLEANFILES = xamlg xamlg.exe
 
@@ -20,4 +22,4 @@
 do_subst = sed -e 's,[EMAIL PROTECTED]@],$(moondir),g' -e 's,[EMAIL 
PROTECTED]@],$(VERSION),g' 
 
 run:
-       mono --debug xamlg.exe
\ No newline at end of file
+       mono --debug xamlg.exe

_______________________________________________
Mono-patches maillist  -  [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches

Reply via email to