[prev in list] [next in list] [prev in thread] [next in thread] 

List:       gnash-commit
Subject:    [Gnash-commit] gnash/plugin/klash Makefile.am
From:       Rob Savoye <rob () welcomehome ! org>
Date:       2006-04-25 17:22:11
Message-ID: E1FYREp-000099-Rz () savannah ! gnu ! org
[Download RAW message or body]

CVSROOT:	/sources/gnash
Module name:	gnash
Branch: 	
Changes by:	Rob Savoye <rsavoye@savannah.gnu.org>	06/04/25 17:22:11

Modified files:
	plugin/klash   : Makefile.am 

Log message:
	* plugin/klash/Makefile.am: Build a MOC file for klash.cpp.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/plugin/klash/Makefile.am.diff?tr1=1.7&tr2=1.8&r1=text&r2=text


Patches:
Index: gnash/plugin/klash/Makefile.am
diff -u gnash/plugin/klash/Makefile.am:1.7 gnash/plugin/klash/Makefile.am:1.8
--- gnash/plugin/klash/Makefile.am:1.7	Tue Apr 25 14:43:38 2006
+++ gnash/plugin/klash/Makefile.am	Tue Apr 25 17:22:11 2006
@@ -46,7 +46,7 @@
 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_DEPENDENCIES = klash_part.moc
+libklashpart_la_DEPENDENCIES = klash_part.moc klash.moc
 
 libklashpart.la: $(libklashpart_la_DEPENDENCIES) $(libklashpart_la_OBJECTS) 
 	$(CXXLINK) -rpath $(kde_moduledir) $(libklashpart_la_LDFLAGS) \
$(libklashpart_la_OBJECTS) $(libklashpart_la_LIBADD) $(LIBS) @@ -118,7 +118,7 @@
 	../../libbase/libgnashbase.la
 
 
-CLEANFILES = klash_part.moc
+CLEANFILES = klash_part.moc klash.moc
 dummy.cpp:
 	echo > dummy.cpp
 
@@ -134,3 +134,12 @@
 	  ln -s $(srcdir)/klash_part.moc.in klash_part.moc; \
 	fi
 
+klash.moc: $(srcdir)/klash.cpp
+	@if test x"$(MOC)" != x; then \
+	  echo "Generating MOC file..."; \
+	  $(MOC) $(srcdir)/klash.cpp -o klash.moc; \
+	else  \
+	  echo "WARNING: Install QT's moc tool! Linking to default MOC file"; \
+	  ln -s $(srcdir)/klash.moc.in klash.moc; \
+	fi
+


[prev in list] [next in list] [prev in thread] [next in thread]