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

[Rob Savoye]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Rob Savoye <rsavoye>    07/02/02 15:50:28

Modified files:
        .              : ChangeLog 
        plugin/klash   : Makefile.am 

Log message:
                * plugin/klash/Makefile.am: Simplify heavily as most of the KDE
                settings we don't need for a simple kpart.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.2235&r2=1.2236
http://cvs.savannah.gnu.org/viewcvs/gnash/plugin/klash/Makefile.am?cvsroot=gnash&r1=1.24&r2=1.25

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.2235
retrieving revision 1.2236
diff -u -b -r1.2235 -r1.2236
--- ChangeLog   2 Feb 2007 14:11:52 -0000       1.2235
+++ ChangeLog   2 Feb 2007 15:50:28 -0000       1.2236
@@ -1,3 +1,8 @@
+2007-02-02  Rob Savoye  <address@hidden>
+
+       * plugin/klash/Makefile.am: Simplify heavily as most of the KDE
+       settings we don't need for a simple kpart.
+
 2007-02-02 Sandro Santilli <address@hidden>
 
        * server/as_object.h (set_prototype): made public, as any

Index: plugin/klash/Makefile.am
===================================================================
RCS file: /sources/gnash/gnash/plugin/klash/Makefile.am,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -b -r1.24 -r1.25
--- plugin/klash/Makefile.am    2 Feb 2007 08:45:41 -0000       1.24
+++ plugin/klash/Makefile.am    2 Feb 2007 15:50:28 -0000       1.25
@@ -15,93 +15,26 @@
 # 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.24 2007/02/02 08:45:41 strk Exp $
+# $Id: Makefile.am,v 1.25 2007/02/02 15:50:28 rsavoye Exp $
 
 AUTOMAKE_OPTIONS = 
 
-AM_CPPFLAGS= -I$(kde_includes)/kio $(all_includes)
-
-METASOURCES= AUTO
+if KLASH
+AM_CPPFLAGS= $(KDE_CFLAGS) $(QT_CFLAGS)
 
-# Dunno the correct 
-kde_moduledir = $(KDE_MODULESDIR)
-kde_module_LTLIBRARIES= libklashpart.la
+plugindir   = $(libdir)/kde3
+plugin_LTLIBRARIES= libklashpart.la
 
 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
+if PLUGIN_LINK_UNDEFINED
+libklashpart_la_LDFLAGS = -avoid-version -L$(plugindir)
+else
+libklashpart_la_LDFLAGS = -module -avoid-version -L$(plugindir)
+endif
 
-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
-
-#bin_PROGRAMS= $(klashplayer_app)
-
-#klashplayer_LDADD=  #$(LIB_XINE) -lDCOP
-#klashplayer_CFLAGS= #$(CFLAGS_XINE)
-#klashplayer_LDFLAGS= $(all_libraries) $(KDE_RPATH)
-#klashplayer_SOURCES= glashplayer.cpp
-
-#xdg_apps_DATA = klash.desktop
-
-kde_servicesdir = $(KDE_SERVICESDIR)
-dist_kde_services_DATA = klash_part.desktop
-
-dist_rc_DATA = klashpartui.rc
-rcdir = $(kde_datadir)/klash
-
-dist_conf_DATA = klashrc
-confdir = $(kde_confdir)
-
-appsdatadir=$(kde_datadir)/klash
-dist_appsdata_DATA= pluginsinfo
-
-dummy.cpp:
-       echo > dummy.cpp
-
-messages: rc.cpp
-       $(XGETTEXT) *.cpp -o $(podir)/klash.pot
-
-if KLASH
-#bin_PROGRAMS = klash
-
-# klash_SOURCES = klash.cpp
-# klash_CPPFLAGS = \
-#         -I.. \
-#         -I$(top_srcdir) \
-#         -I$(top_srcdir)/server  \
-#         -I$(top_srcdir)/server/parser \
-#         -I$(top_srcdir)/server/asobj \
-#         -I$(top_srcdir)/server/vm \
-#         -I$(top_srcdir)/libbase \
-#         -I$(top_srcdir)/libgeometry \
-#         -I$(top_srcdir)/backend \
-#      $(LIBXML_CFLAGS) \
-#      $(OPENGL_CFLAGS) \
-#      $(KDE_CFLAGS) \
-#      -DUSE_KDE
-
-# klash_LDADD = \
-#      $(KDE_LIBS) \
-#      $(OPENGL_LIBS) \
-#      $(LIBXML_LIBS) \
-#      $(PTHREAD_LIBS) \
-#         ../../backend/libgnashbackend.la \
-#         ../../server/libgnashserver.la \
-#         ../../server/asobj/libgnashasobjs.la \
-#         ../../libgeometry/libgnashgeo.la \
-#         ../../libbase/libgnashbase.la
-
-# klash_DEPENDENCIES =  klash.moc
 BUILT_SOURCES = klash_part.moc klash.moc
-
 CLEANFILES = klash_part.moc klash.moc
-endif
 
 klash_part.moc: $(srcdir)/klash_part.h
        @if test x"$(MOC)" != x; then \
@@ -120,3 +53,17 @@
          echo "WARNING: Install QT's moc tool! Linking to default MOC file"; \
          ln -s $(srcdir)/klash.moc.in klash.moc; \
        fi
+
+install-pluginLTLIBRARIES: $(plugin_LTLIBRARIES)
+       test -d "$(DESTDIR)$(plugindir)" || $(mkinstalldirs) 
"$(DESTDIR)$(plugindir)"
+#      cp .libs/libklashpart.so $(DESTDIR)$(plugindir)/libklashpart.so
+       $(LIBTOOL) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) 
$(plugin_LTLIBRARIES) "$(DESTDIR)$(plugindir)/$(plugin_LTLIBRARIES)"
+#      $(RM) libklashpart.*a $(DESTDIR)$(plugindir)/libklashpart.so.0
+
+uninstall-pluginLTLIBRARIES: $(plugin_LTLIBRARIES)
+       $(RM) -f $(DESTDIR)$(plugindir)/libklashpart.so
+
+else
+all:
+       $echo "Building klash is disabled"
+endif