[Xfce4-commits] <parole:master> rename parole to src and put the common header files in parole to make it compiles.
Ali Abdallah
noreply at xfce.org
Thu Nov 19 22:58:01 CET 2009
Updating branch refs/heads/master
to e36fdd155c46010b3c477eb0d79fc6e514e33f2b (commit)
from 48ff004a6df32415d9baef7580b28530b1f46269 (commit)
commit e36fdd155c46010b3c477eb0d79fc6e514e33f2b
Author: Ali Abdallah <ali at ali-xfce.org>
Date: Thu Nov 19 22:50:52 2009 +0100
rename parole to src and put the common header files
in parole to make it compiles.
Makefile.am | 1 +
configure.ac.in | 1 +
parole/Makefile.am | 190 +--------------------------
{gst => parole}/parole-stream.h | 0
{parole => src}/Makefile.am | 18 +---
{parole => src}/gmarshal.list | 0
{parole => src}/main.c | 0
{parole => src}/org.parole.media.list.xml | 0
{parole => src}/org.parole.media.player.xml | 0
{parole => src}/parole-about.c | 0
{parole => src}/parole-about.h | 0
{parole => src}/parole-builder.c | 0
{parole => src}/parole-builder.h | 0
{parole => src}/parole-button.c | 0
{parole => src}/parole-button.h | 0
{parole => src}/parole-conf-dialog.c | 0
{parole => src}/parole-conf-dialog.h | 0
{parole => src}/parole-conf.c | 0
{parole => src}/parole-conf.h | 0
{parole => src}/parole-debug.c | 0
{parole => src}/parole-debug.h | 0
{parole => src}/parole-disc-menu.c | 0
{parole => src}/parole-disc-menu.h | 0
{parole => src}/parole-disc.c | 0
{parole => src}/parole-disc.h | 0
{parole => src}/parole-file.c | 0
{parole => src}/parole-filters.c | 0
{parole => src}/parole-filters.h | 0
{parole => src}/parole-mediachooser.c | 0
{parole => src}/parole-mediachooser.h | 0
{parole => src}/parole-medialist.c | 0
{parole => src}/parole-medialist.h | 0
{parole => src}/parole-module.c | 0
{parole => src}/parole-module.h | 0
{parole => src}/parole-open-location.c | 0
{parole => src}/parole-open-location.h | 0
{parole => src}/parole-pl-parser.c | 0
{parole => src}/parole-pl-parser.h | 0
{parole => src}/parole-player.c | 0
{parole => src}/parole-player.h | 0
{parole => src}/parole-plugin.c | 0
{parole => src}/parole-plugins-manager.c | 0
{parole => src}/parole-plugins-manager.h | 0
{parole => src}/parole-rc-utils.c | 0
{parole => src}/parole-rc-utils.h | 0
{parole => src}/parole-screensaver.c | 0
{parole => src}/parole-screensaver.h | 0
{parole => src}/parole-session.c | 0
{parole => src}/parole-session.h | 0
{parole => src}/parole-statusbar.c | 0
{parole => src}/parole-statusbar.h | 0
{parole => src}/parole-subtitle-encoding.c | 0
{parole => src}/parole-subtitle-encoding.h | 0
{parole => src}/parole-utils.c | 0
{parole => src}/parole-utils.h | 0
{parole => src}/parole-vis.c | 0
{parole => src}/parole-vis.h | 0
57 files changed, 10 insertions(+), 200 deletions(-)
diff --git a/Makefile.am b/Makefile.am
index d6d9f46..a3bad15 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -8,6 +8,7 @@ SUBDIRS = \
gst \
dbus \
parole \
+ src \
plugins \
$(browser_plugin_dir) \
docs \
diff --git a/configure.ac.in b/configure.ac.in
index b076986..2762654 100644
--- a/configure.ac.in
+++ b/configure.ac.in
@@ -244,6 +244,7 @@ common/Makefile
gst/Makefile
dbus/Makefile
parole/Makefile
+src/Makefile
plugins/Makefile
plugins/properties/Makefile
plugins/tray/Makefile
diff --git a/parole/Makefile.am b/parole/Makefile.am
index 325acfc..78d0d27 100644
--- a/parole/Makefile.am
+++ b/parole/Makefile.am
@@ -1,192 +1,14 @@
-bin_PROGRAMS = parole
-
-noinst_LTLIBRARIES = \
- libparole.la
-
-INCLUDES = \
- -I$(top_srcdir) \
- -I$(top_srcdir)/data \
- -I$(top_srcdir)/data/mime \
- -I$(top_srcdir)/gst \
- -I$(top_srcdir)/dbus \
- -I$(top_srcdir)/common \
- -DLOCALEDIR=\"$(localedir)\" \
- -DG_LOG_DOMAIN=\"parole\" \
- -DPAROLE_PLUGINS_DIR=\"$(libdir)/parole-$(PAROLE_VERSION_API)\"\
- $(GTHREAD_CFLAGS) \
- $(GIO_CFLAGS) \
- $(DBUS_GLIB_CFLAGS) \
- $(LIBXFCE4GUI_CFLAGS) \
- $(GST_VIDEO_CFLAGS) \
- $(GST_INTERFACES_CFLAGS) \
- $(TAGLIBC_CFLAGS)
-
-PAROLE_LDFLAGS = \
- -export-dynamic \
- -no-undefined \
- -export-symbols-regex "^[[^_]].*"
-
-PAROLE_LIBS = \
- $(top_builddir)/dbus/libparoledbus.la \
- $(top_builddir)/gst/libparolegst.la \
- $(top_builddir)/common/libparolecommon.la\
- $(GTHREAD_LIBS) \
- $(GIO_LIBS) \
- $(DBUS_GLIB_LIBS) \
- $(LIBXFCE4GUI_LIBS) \
- $(GST_VIDEO_LIBS) \
- $(GST_INTERFACES_LIBS) \
- $(TAGLIBC_LIBS)
-
-GENERATED_FILES = \
- gmarshal.c \
- gmarshal.h \
- enum-gtypes.c \
- enum-gtypes.h \
- org.parole.media.list.h \
- org.parole.media.player.h
-
INST_HFILES = \
parole.h \
parole-plugin.h \
- parole-file.h
-
-NOINST_HFILES = \
- parole-player.h \
- parole-vis.h \
- parole-statusbar.h \
- parole-mediachooser.h \
- parole-filters.h \
- parole-screensaver.h \
- parole-conf.h \
- parole-conf-dialog.h \
- parole-rc-utils.h \
- parole-utils.h \
- parole-disc.h \
- parole-medialist.h \
- parole-debug.h \
- parole-plugins-manager.h \
- parole-module.h \
- parole-pl-parser.h \
- parole-about.h \
- parole-builder.h \
- parole-subtitle-encoding.h \
- parole-open-location.h \
- parole-disc-menu.h \
- parole-session.h \
- parole-button.h
+ parole-file.h \
+ parole-stream.h
-libparole_headers = \
+parole_headers = \
$(INST_HFILES)
-libparole_includedir = \
+parole_includedir = \
$(includedir)/parole
-libparole_include_HEADERS = \
- $(libparole_headers)
-
-libparole_la_SOURCES = \
- $(GENERATED_FILES) \
- $(INST_HFILES) \
- $(NOINST_HFILES) \
- parole-player.c \
- parole-file.c \
- parole-vis.c \
- parole-statusbar.c \
- parole-medialist.c \
- parole-mediachooser.c \
- parole-filters.c \
- parole-screensaver.c \
- parole-conf.c \
- parole-conf-dialog.c \
- parole-disc.c \
- parole-rc-utils.c \
- parole-utils.c \
- parole-debug.c \
- parole-plugins-manager.c \
- parole-plugin.c \
- parole-module.c \
- parole-pl-parser.c \
- parole-about.c \
- parole-builder.c \
- parole-subtitle-encoding.c \
- parole-open-location.c \
- parole-disc-menu.c \
- parole-session.c \
- parole-button.c
-
-libparole_la_LDFLAGS = \
- $(PAROLE_LDFLAGS)
-
-libparole_la_LIBADD = \
- $(PAROLE_LIBS)
-
-parole_SOURCES = \
- main.c
-
-parole_LDADD = \
- libparole.la
-
-parole_LDFLAGS = \
- $(PAROLE_LDFLAGS)
-
-parole_glib_enum_headers = \
- parole-plugin.h \
- parole-pl-parser.h \
- parole-conf.h \
- parole-button.h
-
-if MAINTAINER_MODE
-
-BUILT_SOURCES = \
- $(GENERATED_FILES)
-
-gmarshal.c: gmarshal.list
- echo "#include \"gmarshal.h\"" > $@ && \
- glib-genmarshal $< --prefix=_gmarshal --body >> $@
-
-gmarshal.h: gmarshal.list
- glib-genmarshal $< --prefix=_gmarshal --header > $@
-
-enum-gtypes.h: stamp-enum-gtypes.h
- @true
-stamp-enum-gtypes.h: $(parole_glib_enum_headers) Makefile
- ( cd $(srcdir) && glib-mkenums \
- --fhead "#ifndef __ENUM_GTYPES_H__\n#define __ENUM_GTYPES_H__\n#include <glib-object.h>\nG_BEGIN_DECLS\n" \
- --fprod "/* enumerations from \"@filename@\" */\n" \
- --vhead "GType @enum_name at _get_type (void);\n#define ENUM_GTYPE_ at ENUMSHORT@ (@enum_name at _get_type())\n" \
- --ftail "G_END_DECLS\n\n#endif /* __ENUM_GTYPES_H__ */" \
- $(parole_glib_enum_headers) ) > xgen-enum.h \
- && (cmp -s xgen-enum.h enum-gtypes.h || cp xgen-enum.h enum-gtypes.h) \
- && rm -f xgen-enum.h \
- && echo timestamp > $(@F)
-
-enum-gtypes.c: $(parole_glib_enum_headers) Makefile
- ( cd $(srcdir) && glib-mkenums \
- --fhead "#include \"enum-gtypes.h\"\n\n" \
- --fhead "#include \"parole-plugin.h\"\n\n" \
- --fhead "#include \"parole-pl-parser.h\"\n\n" \
- --fhead "#include \"parole-conf.h\"\n\n" \
- --fhead "#include \"parole-button.h\"\n\n" \
- --fprod "\n/* enumerations from \"@filename@\" */" \
- --vhead "GType\n at enum_name@_get_type (void)\n{\n static GType etype = 0;\n if (etype == 0) {\n static const G at Type@Value values[] = {" \
- --vprod " { @VALUENAME@, \"@VALUENAME@\", \"@valuenick@\" }," \
- --vtail " { 0, NULL, NULL }\n };\n etype = g_ at type@_register_static (\"@EnumName@\", values);\n }\n return etype;\n}\n" \
- $(parole_glib_enum_headers) ) >> xgen-enum.c \
- && cp xgen-enum.c enum-gtypes.c \
- && rm -f xgen-enum.c
-
-org.parole.media.list.h: $(srcdir)/org.parole.media.list.xml
- dbus-binding-tool --mode=glib-server --prefix=parole_media_list $< >$@
-
-org.parole.media.player.h: $(srcdir)/org.parole.media.player.xml
- dbus-binding-tool --mode=glib-server --prefix=parole_player $< >$@
-
-endif
-
-EXTRA_DIST = \
- gmarshal.list
-
-DISTCLEANFILES = \
- $(BUILT_SOURCES) \
- stamp-enum-gtypes.h
+parole_include_HEADERS = \
+ $(parole_headers)
\ No newline at end of file
diff --git a/gst/parole-stream.h b/parole/parole-stream.h
similarity index 100%
rename from gst/parole-stream.h
rename to parole/parole-stream.h
diff --git a/parole/Makefile.am b/src/Makefile.am
similarity index 94%
copy from parole/Makefile.am
copy to src/Makefile.am
index 325acfc..9a13c1a 100644
--- a/parole/Makefile.am
+++ b/src/Makefile.am
@@ -5,6 +5,7 @@ noinst_LTLIBRARIES = \
INCLUDES = \
-I$(top_srcdir) \
+ -I$(top_srcdir)/parole \
-I$(top_srcdir)/data \
-I$(top_srcdir)/data/mime \
-I$(top_srcdir)/gst \
@@ -46,11 +47,6 @@ GENERATED_FILES = \
org.parole.media.list.h \
org.parole.media.player.h
-INST_HFILES = \
- parole.h \
- parole-plugin.h \
- parole-file.h
-
NOINST_HFILES = \
parole-player.h \
parole-vis.h \
@@ -76,18 +72,8 @@ NOINST_HFILES = \
parole-session.h \
parole-button.h
-libparole_headers = \
- $(INST_HFILES)
-
-libparole_includedir = \
- $(includedir)/parole
-
-libparole_include_HEADERS = \
- $(libparole_headers)
-
libparole_la_SOURCES = \
$(GENERATED_FILES) \
- $(INST_HFILES) \
$(NOINST_HFILES) \
parole-player.c \
parole-file.c \
@@ -131,7 +117,7 @@ parole_LDFLAGS = \
$(PAROLE_LDFLAGS)
parole_glib_enum_headers = \
- parole-plugin.h \
+ $(top_srcdir)/parole/parole-plugin.h \
parole-pl-parser.h \
parole-conf.h \
parole-button.h
diff --git a/parole/gmarshal.list b/src/gmarshal.list
similarity index 100%
copy from parole/gmarshal.list
copy to src/gmarshal.list
diff --git a/parole/main.c b/src/main.c
similarity index 100%
copy from parole/main.c
copy to src/main.c
diff --git a/parole/org.parole.media.list.xml b/src/org.parole.media.list.xml
similarity index 100%
copy from parole/org.parole.media.list.xml
copy to src/org.parole.media.list.xml
diff --git a/parole/org.parole.media.player.xml b/src/org.parole.media.player.xml
similarity index 100%
copy from parole/org.parole.media.player.xml
copy to src/org.parole.media.player.xml
diff --git a/parole/parole-about.c b/src/parole-about.c
similarity index 100%
copy from parole/parole-about.c
copy to src/parole-about.c
diff --git a/parole/parole-about.h b/src/parole-about.h
similarity index 100%
copy from parole/parole-about.h
copy to src/parole-about.h
diff --git a/parole/parole-builder.c b/src/parole-builder.c
similarity index 100%
copy from parole/parole-builder.c
copy to src/parole-builder.c
diff --git a/parole/parole-builder.h b/src/parole-builder.h
similarity index 100%
copy from parole/parole-builder.h
copy to src/parole-builder.h
diff --git a/parole/parole-button.c b/src/parole-button.c
similarity index 100%
copy from parole/parole-button.c
copy to src/parole-button.c
diff --git a/parole/parole-button.h b/src/parole-button.h
similarity index 100%
copy from parole/parole-button.h
copy to src/parole-button.h
diff --git a/parole/parole-conf-dialog.c b/src/parole-conf-dialog.c
similarity index 100%
copy from parole/parole-conf-dialog.c
copy to src/parole-conf-dialog.c
diff --git a/parole/parole-conf-dialog.h b/src/parole-conf-dialog.h
similarity index 100%
copy from parole/parole-conf-dialog.h
copy to src/parole-conf-dialog.h
diff --git a/parole/parole-conf.c b/src/parole-conf.c
similarity index 100%
copy from parole/parole-conf.c
copy to src/parole-conf.c
diff --git a/parole/parole-conf.h b/src/parole-conf.h
similarity index 100%
copy from parole/parole-conf.h
copy to src/parole-conf.h
diff --git a/parole/parole-debug.c b/src/parole-debug.c
similarity index 100%
copy from parole/parole-debug.c
copy to src/parole-debug.c
diff --git a/parole/parole-debug.h b/src/parole-debug.h
similarity index 100%
copy from parole/parole-debug.h
copy to src/parole-debug.h
diff --git a/parole/parole-disc-menu.c b/src/parole-disc-menu.c
similarity index 100%
copy from parole/parole-disc-menu.c
copy to src/parole-disc-menu.c
diff --git a/parole/parole-disc-menu.h b/src/parole-disc-menu.h
similarity index 100%
copy from parole/parole-disc-menu.h
copy to src/parole-disc-menu.h
diff --git a/parole/parole-disc.c b/src/parole-disc.c
similarity index 100%
copy from parole/parole-disc.c
copy to src/parole-disc.c
diff --git a/parole/parole-disc.h b/src/parole-disc.h
similarity index 100%
copy from parole/parole-disc.h
copy to src/parole-disc.h
diff --git a/parole/parole-file.c b/src/parole-file.c
similarity index 100%
copy from parole/parole-file.c
copy to src/parole-file.c
diff --git a/parole/parole-filters.c b/src/parole-filters.c
similarity index 100%
copy from parole/parole-filters.c
copy to src/parole-filters.c
diff --git a/parole/parole-filters.h b/src/parole-filters.h
similarity index 100%
copy from parole/parole-filters.h
copy to src/parole-filters.h
diff --git a/parole/parole-mediachooser.c b/src/parole-mediachooser.c
similarity index 100%
copy from parole/parole-mediachooser.c
copy to src/parole-mediachooser.c
diff --git a/parole/parole-mediachooser.h b/src/parole-mediachooser.h
similarity index 100%
copy from parole/parole-mediachooser.h
copy to src/parole-mediachooser.h
diff --git a/parole/parole-medialist.c b/src/parole-medialist.c
similarity index 100%
copy from parole/parole-medialist.c
copy to src/parole-medialist.c
diff --git a/parole/parole-medialist.h b/src/parole-medialist.h
similarity index 100%
copy from parole/parole-medialist.h
copy to src/parole-medialist.h
diff --git a/parole/parole-module.c b/src/parole-module.c
similarity index 100%
copy from parole/parole-module.c
copy to src/parole-module.c
diff --git a/parole/parole-module.h b/src/parole-module.h
similarity index 100%
copy from parole/parole-module.h
copy to src/parole-module.h
diff --git a/parole/parole-open-location.c b/src/parole-open-location.c
similarity index 100%
copy from parole/parole-open-location.c
copy to src/parole-open-location.c
diff --git a/parole/parole-open-location.h b/src/parole-open-location.h
similarity index 100%
copy from parole/parole-open-location.h
copy to src/parole-open-location.h
diff --git a/parole/parole-pl-parser.c b/src/parole-pl-parser.c
similarity index 100%
copy from parole/parole-pl-parser.c
copy to src/parole-pl-parser.c
diff --git a/parole/parole-pl-parser.h b/src/parole-pl-parser.h
similarity index 100%
copy from parole/parole-pl-parser.h
copy to src/parole-pl-parser.h
diff --git a/parole/parole-player.c b/src/parole-player.c
similarity index 100%
copy from parole/parole-player.c
copy to src/parole-player.c
diff --git a/parole/parole-player.h b/src/parole-player.h
similarity index 100%
copy from parole/parole-player.h
copy to src/parole-player.h
diff --git a/parole/parole-plugin.c b/src/parole-plugin.c
similarity index 100%
copy from parole/parole-plugin.c
copy to src/parole-plugin.c
diff --git a/parole/parole-plugins-manager.c b/src/parole-plugins-manager.c
similarity index 100%
copy from parole/parole-plugins-manager.c
copy to src/parole-plugins-manager.c
diff --git a/parole/parole-plugins-manager.h b/src/parole-plugins-manager.h
similarity index 100%
copy from parole/parole-plugins-manager.h
copy to src/parole-plugins-manager.h
diff --git a/parole/parole-rc-utils.c b/src/parole-rc-utils.c
similarity index 100%
copy from parole/parole-rc-utils.c
copy to src/parole-rc-utils.c
diff --git a/parole/parole-rc-utils.h b/src/parole-rc-utils.h
similarity index 100%
copy from parole/parole-rc-utils.h
copy to src/parole-rc-utils.h
diff --git a/parole/parole-screensaver.c b/src/parole-screensaver.c
similarity index 100%
copy from parole/parole-screensaver.c
copy to src/parole-screensaver.c
diff --git a/parole/parole-screensaver.h b/src/parole-screensaver.h
similarity index 100%
copy from parole/parole-screensaver.h
copy to src/parole-screensaver.h
diff --git a/parole/parole-session.c b/src/parole-session.c
similarity index 100%
copy from parole/parole-session.c
copy to src/parole-session.c
diff --git a/parole/parole-session.h b/src/parole-session.h
similarity index 100%
copy from parole/parole-session.h
copy to src/parole-session.h
diff --git a/parole/parole-statusbar.c b/src/parole-statusbar.c
similarity index 100%
copy from parole/parole-statusbar.c
copy to src/parole-statusbar.c
diff --git a/parole/parole-statusbar.h b/src/parole-statusbar.h
similarity index 100%
copy from parole/parole-statusbar.h
copy to src/parole-statusbar.h
diff --git a/parole/parole-subtitle-encoding.c b/src/parole-subtitle-encoding.c
similarity index 100%
copy from parole/parole-subtitle-encoding.c
copy to src/parole-subtitle-encoding.c
diff --git a/parole/parole-subtitle-encoding.h b/src/parole-subtitle-encoding.h
similarity index 100%
copy from parole/parole-subtitle-encoding.h
copy to src/parole-subtitle-encoding.h
diff --git a/parole/parole-utils.c b/src/parole-utils.c
similarity index 100%
copy from parole/parole-utils.c
copy to src/parole-utils.c
diff --git a/parole/parole-utils.h b/src/parole-utils.h
similarity index 100%
copy from parole/parole-utils.h
copy to src/parole-utils.h
diff --git a/parole/parole-vis.c b/src/parole-vis.c
similarity index 100%
copy from parole/parole-vis.c
copy to src/parole-vis.c
diff --git a/parole/parole-vis.h b/src/parole-vis.h
similarity index 100%
copy from parole/parole-vis.h
copy to src/parole-vis.h
More information about the Xfce4-commits
mailing list