diff options
| -rw-r--r-- | ChangeLog | 19 | ||||
| -rw-r--r-- | Makefile.am | 2 | ||||
| -rw-r--r-- | browser-plugin/Makefile.am | 42 | ||||
| -rw-r--r-- | configure.in | 4 | ||||
| -rw-r--r-- | plparse/Makefile.am (renamed from src/plparse/Makefile.am) | 23 | ||||
| -rw-r--r-- | plparse/disc-test.c (renamed from src/disc-test.c) | 0 | ||||
| -rw-r--r-- | plparse/plparser.symbols (renamed from src/plparse/plparser.symbols) | 0 | ||||
| -rw-r--r-- | plparse/test-parser.c (renamed from src/plparse/test-parser.c) | 0 | ||||
| -rw-r--r-- | plparse/totem-disc.c (renamed from src/plparse/totem-disc.c) | 0 | ||||
| -rw-r--r-- | plparse/totem-disc.h (renamed from src/plparse/totem-disc.h) | 0 | ||||
| -rw-r--r-- | plparse/totem-pl-parser-features.h.in (renamed from src/plparse/totem-pl-parser-features.h.in) | 0 | ||||
| -rw-r--r-- | plparse/totem-pl-parser-lines.c (renamed from src/plparse/totem-pl-parser-lines.c) | 0 | ||||
| -rw-r--r-- | plparse/totem-pl-parser-lines.h (renamed from src/plparse/totem-pl-parser-lines.h) | 0 | ||||
| -rw-r--r-- | plparse/totem-pl-parser-media.c (renamed from src/plparse/totem-pl-parser-media.c) | 0 | ||||
| -rw-r--r-- | plparse/totem-pl-parser-media.h (renamed from src/plparse/totem-pl-parser-media.h) | 0 | ||||
| -rw-r--r-- | plparse/totem-pl-parser-mini.h (renamed from src/plparse/totem-pl-parser-mini.h) | 0 | ||||
| -rw-r--r-- | plparse/totem-pl-parser-misc.c (renamed from src/plparse/totem-pl-parser-misc.c) | 0 | ||||
| -rw-r--r-- | plparse/totem-pl-parser-misc.h (renamed from src/plparse/totem-pl-parser-misc.h) | 0 | ||||
| -rw-r--r-- | plparse/totem-pl-parser-pla.c (renamed from src/plparse/totem-pl-parser-pla.c) | 0 | ||||
| -rw-r--r-- | plparse/totem-pl-parser-pla.h (renamed from src/plparse/totem-pl-parser-pla.h) | 0 | ||||
| -rw-r--r-- | plparse/totem-pl-parser-pls.c (renamed from src/plparse/totem-pl-parser-pls.c) | 0 | ||||
| -rw-r--r-- | plparse/totem-pl-parser-pls.h (renamed from src/plparse/totem-pl-parser-pls.h) | 0 | ||||
| -rw-r--r-- | plparse/totem-pl-parser-podcast.c (renamed from src/plparse/totem-pl-parser-podcast.c) | 0 | ||||
| -rw-r--r-- | plparse/totem-pl-parser-podcast.h (renamed from src/plparse/totem-pl-parser-podcast.h) | 0 | ||||
| -rw-r--r-- | plparse/totem-pl-parser-private.h (renamed from src/plparse/totem-pl-parser-private.h) | 0 | ||||
| -rw-r--r-- | plparse/totem-pl-parser-qt.c (renamed from src/plparse/totem-pl-parser-qt.c) | 0 | ||||
| -rw-r--r-- | plparse/totem-pl-parser-qt.h (renamed from src/plparse/totem-pl-parser-qt.h) | 0 | ||||
| -rw-r--r-- | plparse/totem-pl-parser-smil.c (renamed from src/plparse/totem-pl-parser-smil.c) | 0 | ||||
| -rw-r--r-- | plparse/totem-pl-parser-smil.h (renamed from src/plparse/totem-pl-parser-smil.h) | 0 | ||||
| -rw-r--r-- | plparse/totem-pl-parser-wm.c (renamed from src/plparse/totem-pl-parser-wm.c) | 0 | ||||
| -rw-r--r-- | plparse/totem-pl-parser-wm.h (renamed from src/plparse/totem-pl-parser-wm.h) | 0 | ||||
| -rw-r--r-- | plparse/totem-pl-parser-xspf.c (renamed from src/plparse/totem-pl-parser-xspf.c) | 0 | ||||
| -rw-r--r-- | plparse/totem-pl-parser-xspf.h (renamed from src/plparse/totem-pl-parser-xspf.h) | 0 | ||||
| -rw-r--r-- | plparse/totem-pl-parser.c (renamed from src/plparse/totem-pl-parser.c) | 0 | ||||
| -rw-r--r-- | plparse/totem-pl-parser.h (renamed from src/plparse/totem-pl-parser.h) | 0 | ||||
| -rw-r--r-- | plparse/totemplparser-marshal.list (renamed from src/plparse/totemplparser-marshal.list) | 0 | ||||
| -rw-r--r-- | plparse/xmllexer.c (renamed from src/plparse/xmllexer.c) | 0 | ||||
| -rw-r--r-- | plparse/xmllexer.h (renamed from src/plparse/xmllexer.h) | 0 | ||||
| -rw-r--r-- | plparse/xmlparser.c (renamed from src/plparse/xmlparser.c) | 0 | ||||
| -rw-r--r-- | plparse/xmlparser.h (renamed from src/plparse/xmlparser.h) | 0 | ||||
| -rw-r--r-- | src/Makefile.am | 68 | ||||
| -rw-r--r-- | src/backend/Makefile.am | 10 | ||||
| -rw-r--r-- | src/plugins/bemused/Makefile.am | 2 | ||||
| -rw-r--r-- | src/plugins/properties/Makefile.am | 2 | ||||
| -rw-r--r-- | src/plugins/skipto/Makefile.am | 2 |
45 files changed, 94 insertions, 80 deletions
@@ -1,3 +1,22 @@ +2007-11-21 Bastien Nocera <hadess@hadess.net> + + * src/plparse/*: Move this... + * plparse/*: ... here + + * src/disc-test.c: Move to the plparse directory + + * Makefile.am: + * browser-plugin/Makefile.am: + * configure.in: + * src/Makefile.am: + * src/backend/Makefile.am: + * src/plugins/bemused/Makefile.am: + * src/plugins/properties/Makefile.am: + * src/plugins/skipto/Makefile.am: + Changes for the above + + (Closes: #496674) + 2007-11-19 Matthias Clasen <mclasen@redhat.com> * src/plugins/totem-plugins-engine.c (totem_plugins_engine_load_file): diff --git a/Makefile.am b/Makefile.am index ee00cf143..9c8f8793e 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,4 +1,4 @@ -SUBDIRS = bindings po data lib src help +SUBDIRS = lib plparse bindings po data src help if ENABLE_BROWSER_PLUGINS SUBDIRS += browser-plugin diff --git a/browser-plugin/Makefile.am b/browser-plugin/Makefile.am index cbd4670fb..05a10efe0 100644 --- a/browser-plugin/Makefile.am +++ b/browser-plugin/Makefile.am @@ -89,10 +89,10 @@ totem_plugin_viewer_CPPFLAGS = \ -I$(top_srcdir) \ -I$(top_srcdir)/lib \ -I$(top_srcdir)/src \ - -I$(top_srcdir)/src/plparse \ + -I$(top_srcdir)/plparse \ -I$(top_srcdir)/src/backend \ -I$(top_builddir)/src \ - -I$(top_builddir)/src/plparse \ + -I$(top_builddir)/plparse \ -I$(top_builddir)/src/backend \ -DGNOMELOCALEDIR="\"$(datadir)/locale\"" \ -DGCONF_PREFIX="\"/apps/totem\"" \ @@ -114,7 +114,7 @@ totem_plugin_viewer_CFLAGS = \ totem_plugin_viewer_LDADD = \ $(top_builddir)/src/backend/libbaconvideowidget.la \ $(top_builddir)/src/libtotem_player.la \ - $(top_builddir)/src/plparse/libtotem-plparser.la \ + $(top_builddir)/plparse/libtotem-plparser.la \ $(top_builddir)/lib/libtotemscrsaver.la \ libtotempluginviewer_helper.la \ $(EXTRA_GNOME_LIBS) \ @@ -154,10 +154,10 @@ libtotem_basic_plugin_la_SOURCES = \ libtotem_basic_plugin_la_CPPFLAGS = \ -I$(top_srcdir)/src \ -I$(top_srcdir)/src/backend \ - -I$(top_srcdir)/src/plparse \ + -I$(top_srcdir)/plparse \ -I$(top_builddir)/src \ -I$(top_builddir)/src/backend \ - -I$(top_builddir)/src/plparse \ + -I$(top_builddir)/plparse \ -Iidl \ $(addprefix -I$(MOZILLA_INCLUDE_ROOT)/,$(gecko_include_subdirs)) \ -DTOTEM_BASIC_PLUGIN \ @@ -182,7 +182,7 @@ libtotem_basic_plugin_la_CXXFLAGS = \ $(AM_CXXFLAGS) libtotem_basic_plugin_la_LIBADD = \ - $(top_builddir)/src/plparse/libtotem-plparser-mini.la \ + $(top_builddir)/plparse/libtotem-plparser-mini.la \ libtotempluginviewer_helper.la \ $(DBUS_LIBS) \ $(MOZILLA_LIBS) \ @@ -223,10 +223,10 @@ libtotem_gmp_plugin_la_SOURCES = \ libtotem_gmp_plugin_la_CPPFLAGS = \ -I$(top_srcdir)/src \ -I$(top_srcdir)/src/backend \ - -I$(top_srcdir)/src/plparse \ + -I$(top_srcdir)/plparse \ -I$(top_builddir)/src \ -I$(top_builddir)/src/backend \ - -I$(top_builddir)/src/plparse \ + -I$(top_builddir)/plparse \ -Iidl \ $(addprefix -I$(MOZILLA_INCLUDE_ROOT)/,$(gecko_include_subdirs)) \ -DTOTEM_GMP_PLUGIN \ @@ -251,7 +251,7 @@ libtotem_gmp_plugin_la_CXXFLAGS = \ $(AM_CXXFLAGS) libtotem_gmp_plugin_la_LIBADD = \ - $(top_builddir)/src/plparse/libtotem-plparser-mini.la \ + $(top_builddir)/plparse/libtotem-plparser-mini.la \ libtotempluginviewer_helper.la \ $(DBUS_LIBS) \ $(MOZILLA_LIBS) \ @@ -286,10 +286,10 @@ libtotem_complex_plugin_la_SOURCES = \ libtotem_complex_plugin_la_CPPFLAGS = \ -I$(top_srcdir)/src \ -I$(top_srcdir)/src/backend \ - -I$(top_srcdir)/src/plparse \ + -I$(top_srcdir)/plparse \ -I$(top_builddir)/src \ -I$(top_builddir)/src/backend \ - -I$(top_builddir)/src/plparse \ + -I$(top_builddir)/plparse \ -Iidl \ $(addprefix -I$(MOZILLA_INCLUDE_ROOT)/,$(gecko_include_subdirs)) \ -DTOTEM_COMPLEX_PLUGIN \ @@ -314,7 +314,7 @@ libtotem_complex_plugin_la_CXXFLAGS = \ $(AM_CXXFLAGS) libtotem_complex_plugin_la_LIBADD = \ - $(top_builddir)/src/plparse/libtotem-plparser-mini.la \ + $(top_builddir)/plparse/libtotem-plparser-mini.la \ libtotempluginviewer_helper.la \ $(DBUS_LIBS) \ $(MOZILLA_LIBS) \ @@ -349,10 +349,10 @@ libtotem_narrowspace_plugin_la_SOURCES = \ libtotem_narrowspace_plugin_la_CPPFLAGS = \ -I$(top_srcdir)/src \ -I$(top_srcdir)/src/backend \ - -I$(top_srcdir)/src/plparse \ + -I$(top_srcdir)/plparse \ -I$(top_builddir)/src \ -I$(top_builddir)/src/backend \ - -I$(top_builddir)/src/plparse \ + -I$(top_builddir)/plparse \ -Iidl \ $(addprefix -I$(MOZILLA_INCLUDE_ROOT)/,$(gecko_include_subdirs)) \ -DTOTEM_NARROWSPACE_PLUGIN \ @@ -377,7 +377,7 @@ libtotem_narrowspace_plugin_la_CXXFLAGS = \ $(AM_CXXFLAGS) libtotem_narrowspace_plugin_la_LIBADD = \ - $(top_builddir)/src/plparse/libtotem-plparser-mini.la \ + $(top_builddir)/plparse/libtotem-plparser-mini.la \ libtotempluginviewer_helper.la \ $(DBUS_LIBS) \ $(MOZILLA_LIBS) \ @@ -412,10 +412,10 @@ libtotem_mully_plugin_la_SOURCES = \ libtotem_mully_plugin_la_CPPFLAGS = \ -I$(top_srcdir)/src \ -I$(top_srcdir)/src/backend \ - -I$(top_srcdir)/src/plparse \ + -I$(top_srcdir)/plparse \ -I$(top_builddir)/src \ -I$(top_builddir)/src/backend \ - -I$(top_builddir)/src/plparse \ + -I$(top_builddir)/plparse \ -Iidl \ $(addprefix -I$(MOZILLA_INCLUDE_ROOT)/,$(gecko_include_subdirs)) \ -DTOTEM_MULLY_PLUGIN \ @@ -440,7 +440,7 @@ libtotem_mully_plugin_la_CXXFLAGS = \ $(AM_CXXFLAGS) libtotem_mully_plugin_la_LIBADD = \ - $(top_builddir)/src/plparse/libtotem-plparser-mini.la \ + $(top_builddir)/plparse/libtotem-plparser-mini.la \ libtotempluginviewer_helper.la \ $(DBUS_LIBS) \ $(MOZILLA_LIBS) \ @@ -475,10 +475,10 @@ libtotem_cone_plugin_la_SOURCES = \ libtotem_cone_plugin_la_CPPFLAGS = \ -I$(top_srcdir)/src \ -I$(top_srcdir)/src/backend \ - -I$(top_srcdir)/src/plparse \ + -I$(top_srcdir)/plparse \ -I$(top_builddir)/src \ -I$(top_builddir)/src/backend \ - -I$(top_builddir)/src/plparse \ + -I$(top_builddir)/plparse \ -Iidl \ $(addprefix -I$(MOZILLA_INCLUDE_ROOT)/,$(gecko_include_subdirs)) \ -DTOTEM_CONE_PLUGIN \ @@ -503,7 +503,7 @@ libtotem_cone_plugin_la_CXXFLAGS = \ $(AM_CXXFLAGS) libtotem_cone_plugin_la_LIBADD = \ - $(top_builddir)/src/plparse/libtotem-plparser-mini.la \ + $(top_builddir)/plparse/libtotem-plparser-mini.la \ libtotempluginviewer_helper.la \ $(DBUS_LIBS) \ $(MOZILLA_LIBS) \ diff --git a/configure.in b/configure.in index 16f48e91d..5e41eba09 100644 --- a/configure.in +++ b/configure.in @@ -1030,6 +1030,8 @@ totem.spec totem-plparser.pc totem-plparser-uninstalled.pc lib/Makefile +plparse/Makefile +plparse/totem-pl-parser-features.h src/Makefile src/plugins/Makefile src/plugins/bemused/Makefile @@ -1048,8 +1050,6 @@ src/plugins/sample-vala/Makefile src/plugins/totem/Makefile src/plugins/youtube/Makefile src/backend/Makefile -src/plparse/Makefile -src/plparse/totem-pl-parser-features.h browser-plugin/Makefile browser-plugin/idl/Makefile data/Makefile diff --git a/src/plparse/Makefile.am b/plparse/Makefile.am index 10ed638f8..187fc812c 100644 --- a/src/plparse/Makefile.am +++ b/plparse/Makefile.am @@ -1,4 +1,4 @@ -noinst_PROGRAMS = test-parser +noinst_PROGRAMS = test-parser disc-test test_parser_SOURCES = test-parser.c @@ -20,6 +20,27 @@ test_parser_LDADD = \ $(EXTRA_GNOME_LIBS) \ libtotem-plparser.la +disc_test_SOURCES = \ + disc-test.c + +disc_test_CPPFLAGS = \ + $(common_defines) \ + $(AM_CPPFLAGS) + +disc_test_CFLAGS = \ + $(WARN_CFLAGS) \ + $(GTK_CFLAGS) \ + $(EXTRA_GNOME_CFLAGS) \ + $(AM_CFLAGS) + +disc_test_LDFLAGS = \ + $(AM_LDFLAGS) + +disc_test_LDADD = \ + libtotem-plparser.la \ + $(GTK_LIBS) \ + $(EXTRA_GNOME_LIBS) + lib_LTLIBRARIES = libtotem-plparser.la noinst_LTLIBRARIES = libtotem-plparser-mini.la diff --git a/src/disc-test.c b/plparse/disc-test.c index 79548736e..79548736e 100644 --- a/src/disc-test.c +++ b/plparse/disc-test.c diff --git a/src/plparse/plparser.symbols b/plparse/plparser.symbols index fbf08e60e..fbf08e60e 100644 --- a/src/plparse/plparser.symbols +++ b/plparse/plparser.symbols diff --git a/src/plparse/test-parser.c b/plparse/test-parser.c index 21bdd9b55..21bdd9b55 100644 --- a/src/plparse/test-parser.c +++ b/plparse/test-parser.c diff --git a/src/plparse/totem-disc.c b/plparse/totem-disc.c index d8e306c75..d8e306c75 100644 --- a/src/plparse/totem-disc.c +++ b/plparse/totem-disc.c diff --git a/src/plparse/totem-disc.h b/plparse/totem-disc.h index 7efb67250..7efb67250 100644 --- a/src/plparse/totem-disc.h +++ b/plparse/totem-disc.h diff --git a/src/plparse/totem-pl-parser-features.h.in b/plparse/totem-pl-parser-features.h.in index c739765f1..c739765f1 100644 --- a/src/plparse/totem-pl-parser-features.h.in +++ b/plparse/totem-pl-parser-features.h.in diff --git a/src/plparse/totem-pl-parser-lines.c b/plparse/totem-pl-parser-lines.c index 14a543619..14a543619 100644 --- a/src/plparse/totem-pl-parser-lines.c +++ b/plparse/totem-pl-parser-lines.c diff --git a/src/plparse/totem-pl-parser-lines.h b/plparse/totem-pl-parser-lines.h index 01b864716..01b864716 100644 --- a/src/plparse/totem-pl-parser-lines.h +++ b/plparse/totem-pl-parser-lines.h diff --git a/src/plparse/totem-pl-parser-media.c b/plparse/totem-pl-parser-media.c index fdc55e445..fdc55e445 100644 --- a/src/plparse/totem-pl-parser-media.c +++ b/plparse/totem-pl-parser-media.c diff --git a/src/plparse/totem-pl-parser-media.h b/plparse/totem-pl-parser-media.h index 2f9056652..2f9056652 100644 --- a/src/plparse/totem-pl-parser-media.h +++ b/plparse/totem-pl-parser-media.h diff --git a/src/plparse/totem-pl-parser-mini.h b/plparse/totem-pl-parser-mini.h index 309e0d592..309e0d592 100644 --- a/src/plparse/totem-pl-parser-mini.h +++ b/plparse/totem-pl-parser-mini.h diff --git a/src/plparse/totem-pl-parser-misc.c b/plparse/totem-pl-parser-misc.c index 9cfcda662..9cfcda662 100644 --- a/src/plparse/totem-pl-parser-misc.c +++ b/plparse/totem-pl-parser-misc.c diff --git a/src/plparse/totem-pl-parser-misc.h b/plparse/totem-pl-parser-misc.h index f452228cb..f452228cb 100644 --- a/src/plparse/totem-pl-parser-misc.h +++ b/plparse/totem-pl-parser-misc.h diff --git a/src/plparse/totem-pl-parser-pla.c b/plparse/totem-pl-parser-pla.c index 8236e64b2..8236e64b2 100644 --- a/src/plparse/totem-pl-parser-pla.c +++ b/plparse/totem-pl-parser-pla.c diff --git a/src/plparse/totem-pl-parser-pla.h b/plparse/totem-pl-parser-pla.h index 186699da7..186699da7 100644 --- a/src/plparse/totem-pl-parser-pla.h +++ b/plparse/totem-pl-parser-pla.h diff --git a/src/plparse/totem-pl-parser-pls.c b/plparse/totem-pl-parser-pls.c index 0ceb96fdc..0ceb96fdc 100644 --- a/src/plparse/totem-pl-parser-pls.c +++ b/plparse/totem-pl-parser-pls.c diff --git a/src/plparse/totem-pl-parser-pls.h b/plparse/totem-pl-parser-pls.h index d2f97977d..d2f97977d 100644 --- a/src/plparse/totem-pl-parser-pls.h +++ b/plparse/totem-pl-parser-pls.h diff --git a/src/plparse/totem-pl-parser-podcast.c b/plparse/totem-pl-parser-podcast.c index 32da514b2..32da514b2 100644 --- a/src/plparse/totem-pl-parser-podcast.c +++ b/plparse/totem-pl-parser-podcast.c diff --git a/src/plparse/totem-pl-parser-podcast.h b/plparse/totem-pl-parser-podcast.h index be89c200f..be89c200f 100644 --- a/src/plparse/totem-pl-parser-podcast.h +++ b/plparse/totem-pl-parser-podcast.h diff --git a/src/plparse/totem-pl-parser-private.h b/plparse/totem-pl-parser-private.h index 4d45084d9..4d45084d9 100644 --- a/src/plparse/totem-pl-parser-private.h +++ b/plparse/totem-pl-parser-private.h diff --git a/src/plparse/totem-pl-parser-qt.c b/plparse/totem-pl-parser-qt.c index b121c4d92..b121c4d92 100644 --- a/src/plparse/totem-pl-parser-qt.c +++ b/plparse/totem-pl-parser-qt.c diff --git a/src/plparse/totem-pl-parser-qt.h b/plparse/totem-pl-parser-qt.h index 886beed1b..886beed1b 100644 --- a/src/plparse/totem-pl-parser-qt.h +++ b/plparse/totem-pl-parser-qt.h diff --git a/src/plparse/totem-pl-parser-smil.c b/plparse/totem-pl-parser-smil.c index be3839e57..be3839e57 100644 --- a/src/plparse/totem-pl-parser-smil.c +++ b/plparse/totem-pl-parser-smil.c diff --git a/src/plparse/totem-pl-parser-smil.h b/plparse/totem-pl-parser-smil.h index a5b8de5dd..a5b8de5dd 100644 --- a/src/plparse/totem-pl-parser-smil.h +++ b/plparse/totem-pl-parser-smil.h diff --git a/src/plparse/totem-pl-parser-wm.c b/plparse/totem-pl-parser-wm.c index fd1cdfab0..fd1cdfab0 100644 --- a/src/plparse/totem-pl-parser-wm.c +++ b/plparse/totem-pl-parser-wm.c diff --git a/src/plparse/totem-pl-parser-wm.h b/plparse/totem-pl-parser-wm.h index bca4e810f..bca4e810f 100644 --- a/src/plparse/totem-pl-parser-wm.h +++ b/plparse/totem-pl-parser-wm.h diff --git a/src/plparse/totem-pl-parser-xspf.c b/plparse/totem-pl-parser-xspf.c index 718968052..718968052 100644 --- a/src/plparse/totem-pl-parser-xspf.c +++ b/plparse/totem-pl-parser-xspf.c diff --git a/src/plparse/totem-pl-parser-xspf.h b/plparse/totem-pl-parser-xspf.h index e79380867..e79380867 100644 --- a/src/plparse/totem-pl-parser-xspf.h +++ b/plparse/totem-pl-parser-xspf.h diff --git a/src/plparse/totem-pl-parser.c b/plparse/totem-pl-parser.c index 3a7fd9df5..3a7fd9df5 100644 --- a/src/plparse/totem-pl-parser.c +++ b/plparse/totem-pl-parser.c diff --git a/src/plparse/totem-pl-parser.h b/plparse/totem-pl-parser.h index 4d21a4e85..4d21a4e85 100644 --- a/src/plparse/totem-pl-parser.h +++ b/plparse/totem-pl-parser.h diff --git a/src/plparse/totemplparser-marshal.list b/plparse/totemplparser-marshal.list index 6e1d8851a..6e1d8851a 100644 --- a/src/plparse/totemplparser-marshal.list +++ b/plparse/totemplparser-marshal.list diff --git a/src/plparse/xmllexer.c b/plparse/xmllexer.c index cb206d6bf..cb206d6bf 100644 --- a/src/plparse/xmllexer.c +++ b/plparse/xmllexer.c diff --git a/src/plparse/xmllexer.h b/plparse/xmllexer.h index 524049a44..524049a44 100644 --- a/src/plparse/xmllexer.h +++ b/plparse/xmllexer.h diff --git a/src/plparse/xmlparser.c b/plparse/xmlparser.c index 89e449fd7..89e449fd7 100644 --- a/src/plparse/xmlparser.c +++ b/plparse/xmlparser.c diff --git a/src/plparse/xmlparser.h b/plparse/xmlparser.h index 420f2c36c..420f2c36c 100644 --- a/src/plparse/xmlparser.h +++ b/plparse/xmlparser.h diff --git a/src/Makefile.am b/src/Makefile.am index 7d1873c49..f2130a40f 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1,8 +1,7 @@ -SUBDIRS = plugins backend plparse +SUBDIRS = plugins backend bin_PROGRAMS = totem totem-video-thumbnailer totem-video-indexer totem-audio-preview libexec_PROGRAMS = -noinst_PROGRAMS = disc-test noinst_LTLIBRARIES = \ libbaconmessageconnection.la \ libtotem_player.la @@ -62,7 +61,7 @@ libtotem_player_la_SOURCES = \ libtotem_player_la_CPPFLAGS = \ -I$(srcdir)/backend \ - -I$(srcdir)/plparse \ + -I$(top_srcdir)/plparse \ -I$(top_builddir)/src/plparse \ $(common_defines) \ $(AM_CPPFLAGS) @@ -117,7 +116,7 @@ totem_SOURCES = \ totem-video-list.h totem_CPPFLAGS = \ - -I$(srcdir)/plparse \ + -I$(top_srcdir)/plparse \ -I$(srcdir)/backend \ -I$(srcdir)/plugins \ -I$(top_builddir)/data \ @@ -136,18 +135,18 @@ totem_CFLAGS = \ totem_LDFLAGS = \ $(AM_LDFLAGS) -totem_LDADD = \ - plparse/libtotem-plparser.la \ - backend/libbaconvideowidget.la \ - plugins/libtotemmodule.la \ - libbaconmessageconnection.la \ - libtotem_player.la \ - $(EXTRA_GNOME_LIBS) \ - $(XVIDMODE_LIBS) \ - $(NVTV_LIBS) \ - $(DBUS_LIBS) \ - $(XTEST_LIBS) \ - $(X_LIBS) \ +totem_LDADD = \ + $(top_builddir)/plparse/libtotem-plparser.la \ + backend/libbaconvideowidget.la \ + plugins/libtotemmodule.la \ + libbaconmessageconnection.la \ + libtotem_player.la \ + $(EXTRA_GNOME_LIBS) \ + $(XVIDMODE_LIBS) \ + $(NVTV_LIBS) \ + $(DBUS_LIBS) \ + $(XTEST_LIBS) \ + $(X_LIBS) \ $(MISSING_PLUGINS_LIBS) if ENABLE_PYTHON @@ -164,7 +163,7 @@ totem_video_thumbnailer_SOURCES = \ totem-resources.h totem_video_thumbnailer_CPPFLAGS = \ - -I$(srcdir)/plparse \ + -I$(top_srcdir)/plparse \ -I$(srcdir)/backend \ $(common_defines) \ $(AM_CPPFLAGS) @@ -201,7 +200,7 @@ libtotem_properties_page_la_SOURCES = \ libtotem_properties_page_la_CPPFLAGS = \ -I$(srcdir)/backend \ - -I$(srcdir)/plparse \ + -I$(top_srcdir)/plparse \ -I$(srcdir)/plugins/properties \ -I$(top_builddir)/data \ $(common_defines) \ @@ -229,7 +228,7 @@ libtotem_properties_page_la_LIBADD = \ $(XVIDMODE_LIBS) \ $(X_LIBS) -noinst_PROGRAMS += test-properties-page +noinst_PROGRAMS = test-properties-page test_properties_page_SOURCES = \ totem-properties-main.c \ @@ -239,7 +238,7 @@ test_properties_page_SOURCES = \ test_properties_page_CPPFLAGS = \ -I$(srcdir)/backend \ - -I$(srcdir)/plparse \ + -I$(top_srcdir)/plparse \ -I$(top_builddir)/data \ -I$(srcdir)/plugins/properties \ $(common_defines) \ @@ -276,7 +275,7 @@ totem_video_indexer_SOURCES = \ totem-resources.h totem_video_indexer_CPPFLAGS = \ - -I$(srcdir)/plparse \ + -I$(top_srcdir)/plparse \ -I$(srcdir)/backend \ -I$(top_builddir)/data \ $(common_defines) \ @@ -307,7 +306,7 @@ totem_audio_preview_SOURCES = \ totem-resources.h totem_audio_preview_CPPFLAGS = \ - -I$(srcdir)/plparse \ + -I$(top_srcdir)/plparse \ -I$(srcdir)/backend \ -I$(top_builddir)/data \ $(common_defines) \ @@ -331,31 +330,6 @@ totem_audio_preview_LDADD = \ $(XVIDMODE_LIBS) \ $(X_LIBS) -# Tests - -disc_test_SOURCES = \ - disc-test.c - -disc_test_CPPFLAGS = \ - -I$(srcdir)/plparse \ - $(common_defines) \ - $(AM_CPPFLAGS) - -disc_test_CFLAGS = \ - $(WARN_CFLAGS) \ - $(GTK_CFLAGS) \ - $(EXTRA_GNOME_CFLAGS) \ - $(AM_CFLAGS) - -disc_test_LDFLAGS = \ - $(AM_LDFLAGS) - -disc_test_LDADD = \ - plparse/libtotem-plparser.la \ - $(GTK_LIBS) \ - $(EXTRA_GNOME_LIBS) - - CLEANFILES = \ *.bak \ core* \ diff --git a/src/backend/Makefile.am b/src/backend/Makefile.am index 8ec9ccdbb..d81b828f2 100644 --- a/src/backend/Makefile.am +++ b/src/backend/Makefile.am @@ -5,7 +5,7 @@ noinst_LTLIBRARIES = libbaconvideowidget.la bvw_test_SOURCES = bvw-test.c bvw_test_CPPFLAGS = \ - -I$(srcdir)/../plparse \ + -I$(top_srcdir)/plparse \ -DDATADIR=\"$(pkgdatadir)\" \ -DLOGO_PATH=DATADIR\"\"G_DIR_SEPARATOR_S\"totem\"G_DIR_SEPARATOR_S\"totem_logo.png\" $(DISABLE_DEPRECATED) \ @@ -46,11 +46,11 @@ libbaconvideowidget_la_SOURCES += \ bacon-video-widget-xine.c endif -libbaconvideowidget_la_CPPFLAGS = \ - -I$(srcdir)/../plparse \ - -D_REENTRANT \ +libbaconvideowidget_la_CPPFLAGS = \ + -I$(top_srcdir)/plparse \ + -D_REENTRANT \ -DGCONF_PREFIX=\""/apps/totem"\" \ - $(DISABLE_DEPRECATED) \ + $(DISABLE_DEPRECATED) \ $(AM_CPPFLAGS) libbaconvideowidget_la_CFLAGS = \ diff --git a/src/plugins/bemused/Makefile.am b/src/plugins/bemused/Makefile.am index da3818325..d3836f321 100644 --- a/src/plugins/bemused/Makefile.am +++ b/src/plugins/bemused/Makefile.am @@ -32,7 +32,7 @@ libbemused_la_CFLAGS = \ $(AM_CFLAGS) \ -I$(top_srcdir)/src \ -I$(top_srcdir)/src/plugins \ - -I$(top_srcdir)/src/plparse \ + -I$(top_srcdir)/plparse \ -I$(top_srcdir)/src/backend EXTRA_DIST = $(plugin_in_files) diff --git a/src/plugins/properties/Makefile.am b/src/plugins/properties/Makefile.am index 4c3b01157..cfcca3d2d 100644 --- a/src/plugins/properties/Makefile.am +++ b/src/plugins/properties/Makefile.am @@ -46,7 +46,7 @@ libbaconvideowidgetproperties_la_CFLAGS = \ $(AM_CFLAGS) \ -I$(top_srcdir)/src \ -I$(top_srcdir)/src/backend \ - -I$(top_srcdir)/src/plparse \ + -I$(top_srcdir)/plparse \ -I$(top_srcdir)/src/plugins EXTRA_DIST = $(plugin_in_files) diff --git a/src/plugins/skipto/Makefile.am b/src/plugins/skipto/Makefile.am index 3d87ef1a7..ac0696990 100644 --- a/src/plugins/skipto/Makefile.am +++ b/src/plugins/skipto/Makefile.am @@ -31,7 +31,7 @@ libskipto_la_LDFLAGS = $(modules_flags) libskipto_la_CPPFLAGS = \ $(common_defines) \ -I$(top_srcdir)/src/backend \ - -I$(top_srcdir)/src/plparse + -I$(top_srcdir)/plparse libskipto_la_CFLAGS = \ $(EXTRA_GNOME_CFLAGS) \ |