Index: Makefile.am
===================================================================
RCS file: /sources/gnash/gnash/Makefile.am,v
retrieving revision 1.16
diff -u -3 -p -r1.16 Makefile.am
--- Makefile.am	9 Mar 2006 19:29:05 -0000	1.16
+++ Makefile.am	12 Mar 2006 21:28:55 -0000
@@ -41,14 +41,17 @@ AUTOMAKE_OPTIONS = dejagnu
 ACLOCAL_AMFLAGS = -I macros
 
 STD_DIRS = libbase libgeometry server backend utilities
-# if PLUGIN
-# PLUG_DIR = plugin
-# endif
+if PLUGIN
+PLUG_DIR = plugin
+endif
+if KLASH
+KLASH_DIR = plugin/klash
+endif
 if DOCBOOK
 DOC_DIRS = doc
 endif
-SUBDIRS      = $(STD_DIRS) plugin $(DOC_DIRS)
-DIST_SUBDIRS = $(STD_DIRS) plugin doc testsuite
+SUBDIRS      = $(STD_DIRS) $(PLUG_DIR) $(KLASH_DIR) $(DOC_DIRS)
+DIST_SUBDIRS = $(STD_DIRS) $(PLUG_DIR) $(KLASH_DIR) doc testsuite
 
 #EXTRA_DIST = macros
 # if HTTP
Index: plugin/Makefile.am
===================================================================
RCS file: /sources/gnash/gnash/plugin/Makefile.am,v
retrieving revision 1.16
diff -u -3 -p -r1.16 Makefile.am
--- plugin/Makefile.am	10 Mar 2006 15:15:13 -0000	1.16
+++ plugin/Makefile.am	12 Mar 2006 21:28:55 -0000
@@ -39,10 +39,7 @@
 
 AUTOMAKE_OPTIONS = dejagnu
 
-if KLASH
-KLASH = klash
-endif
-SUBDIRS = mozilla-sdk $(KLASH) # test
+SUBDIRS = mozilla-sdk # test
 
 if MP3
 MP3_CFLAGS = $(MAD_CFLAGS)
Index: plugin/klash/Makefile.am
===================================================================
RCS file: /sources/gnash/gnash/plugin/klash/Makefile.am,v
retrieving revision 1.3
diff -u -3 -p -r1.3 Makefile.am
--- plugin/klash/Makefile.am	9 Mar 2006 19:29:06 -0000	1.3
+++ plugin/klash/Makefile.am	12 Mar 2006 21:28:55 -0000
@@ -45,9 +45,7 @@ METASOURCES= AUTO
 kde_module_LTLIBRARIES= libklashpart.la
 
 libklashpart_la_SOURCES = klash_part.cpp
-nodist_libklashpart_la_SOURCES= klash_part.moc
 libklashpart_la_LDFLAGS = -avoid-version $(all_libraries) $(KDE_RPATH)
-libklashpart_la_DEPENDANCIES = klash_part.moc
 
 #EXTRA_PROGRAMS = klashplayer
 #klashplayer_app = klashplayer
@@ -79,6 +77,8 @@ dummy.cpp:
 messages: rc.cpp
 	$(XGETTEXT) *.cpp -o $(podir)/klash.pot
 
+$(srcdir)/klash_part.cpp: klash_part.moc
+
 klash_part.moc: $(srcdir)/klash_part.h
 	$(MOC) $(srcdir)/klash_part.h -o klash_part.moc