[Gnash-commit] gnash ChangeLog plugin/Makefile.am

[Sandro Santilli]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Sandro Santilli <strk>  07/08/03 04:27:39

Modified files:
        .              : ChangeLog 
        plugin         : Makefile.am 

Log message:
        * plugin/Makefile.am: always descend to klash/ subdir and let the inner 
Makefile.am handle conditionals for KPARTS.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.3928&r2=1.3929
http://cvs.savannah.gnu.org/viewcvs/gnash/plugin/Makefile.am?cvsroot=gnash&r1=1.62&r2=1.63

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.3928
retrieving revision 1.3929
diff -u -b -r1.3928 -r1.3929
--- ChangeLog   3 Aug 2007 04:22:54 -0000       1.3928
+++ ChangeLog   3 Aug 2007 04:27:39 -0000       1.3929
@@ -1,7 +1,8 @@
 2007-08-02 Sandro Santilli <address@hidden>
 
        * plugin/Makefile.am: don't build libgnashplugin if NSAPI
-         conditional is false.
+         conditional is false; always descend to klash/ subdir
+         and let the inner Makefile.am handle conditionals for KPARTS.
        * plugin/klash/Makefile.am: don't override the 'all' target.
 
 2007-08-02  Rob Savoye  <address@hidden>

Index: plugin/Makefile.am
===================================================================
RCS file: /sources/gnash/gnash/plugin/Makefile.am,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -b -r1.62 -r1.63
--- plugin/Makefile.am  3 Aug 2007 04:22:55 -0000       1.62
+++ plugin/Makefile.am  3 Aug 2007 04:27:39 -0000       1.63
@@ -15,14 +15,11 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
-# $Id: Makefile.am,v 1.62 2007/08/03 04:22:55 strk Exp $
+# $Id: Makefile.am,v 1.63 2007/08/03 04:27:39 strk Exp $
 
 AUTOMAKE_OPTIONS = 
 
-if BUILD_KDE_GUI
-KLASH = klash
-endif
-SUBDIRS = $(KLASH)
+SUBDIRS = klash
 
 # if DMALLOC
 # MALL_CFLAGS = $(DMALLOC_CFLAGS)