commit 96ad689daf220e9ac3fc48c24891da3d74a0b9a0
Author: phantomjinx <p.g.richard...@phantomjinx.co.uk>
Date: Wed Nov 3 22:27:53 2010 +0000
Modifications for distribution tarball
* mserv plugin must be included in plugins makefile
* gtkpod_app-marshallers.list must be included in libgtkpod makefile
* fixed errors in photo_editor plugin makefile
* marshallers.list needs to be included in dist tarball
* configure.in
* Fix versioning to pass on libgtkpod so version to makefiles
configure.in | 23 ++++++++++++++---------
libgtkpod/Makefile.am | 4 +++-
plugins/Makefile.am | 3 ++-
plugins/photo_editor/Makefile.am | 16 ++++++++--------
4 files changed, 27 insertions(+), 19 deletions(-)
---
diff --git a/configure.in b/configure.in
index eda5b8c..ab19d54 100644
--- a/configure.in
+++ b/configure.in
@@ -7,14 +7,18 @@ AC_PREREQ(2.55)
# LIBGTKPOD_MICRO_VERSION += 1;
# LIBGTKPOD_SO_VERSION - see comments
#
-m4_define([LIBGTKPOD_MAJOR_VERSION], [2])
-m4_define([LIBGTKPOD_MINOR_VERSION], [0])
-m4_define([LIBGTKPOD_MICRO_VERSION], [0])
+m4_define([M4_LIBGTKPOD_MAJOR_VERSION], [2])
+m4_define([M4_LIBGTKPOD_MINOR_VERSION], [0])
+m4_define([M4_LIBGTKPOD_MICRO_VERSION], [0])
# If you need a modifier for the version number.
# Normally empty, but can be used to make "fixup" releases.
-m4_define([LIBGTKPOD_EXTRAVERSION], [GIT])
+m4_define([M4_LIBGTKPOD_EXTRAVERSION], [GIT])
-m4_define([LIBGTKPOD_VERSION],
m4_defn([LIBGTKPOD_MAJOR_VERSION]).m4_defn([LIBGTKPOD_MINOR_VERSION]).m4_defn([LIBGTKPOD_MICRO_VERSION])m4_defn([LIBGTKPOD_EXTRAVERSION]))
+m4_define([M4_LIBGTKPOD_VERSION],
m4_defn([M4_LIBGTKPOD_MAJOR_VERSION]).m4_defn([M4_LIBGTKPOD_MINOR_VERSION]).m4_defn([M4_LIBGTKPOD_MICRO_VERSION])m4_defn([M4_LIBGTKPOD_EXTRAVERSION]))
+
+AC_INIT([gtkpod], m4_defn([M4_LIBGTKPOD_VERSION]))
+AM_CONFIG_HEADER(config.h)
+AC_CONFIG_SRCDIR(src/main.c)
dnl libtool versioning
# +1 : 0 : +1 == adds new functions to the interface
@@ -22,11 +26,12 @@ dnl libtool versioning
# changes to the signature and the semantic)
# ? :+1 : ? == just internal changes
# CURRENT : REVISION : AGE
-m4_define([LIBGTKPOD_SO_VERSION], [1:0:0])
+LIBGTKPOD_SO_VERSION="1:0:0"
-AC_INIT([gtkpod], m4_defn([LIBGTKPOD_VERSION]))
-AM_CONFIG_HEADER(config.h)
-AC_CONFIG_SRCDIR(src/main.c)
+LIBGTKPOD_VERSION=m4_defn([M4_LIBGTKPOD_VERSION])
+
+AC_SUBST(LIBGTKPOD_SO_VERSION)
+AC_SUBST(LIBGTKPOD_VERSION)
AM_INIT_AUTOMAKE([1.9 tar-ustar])
AM_MAINTAINER_MODE
diff --git a/libgtkpod/Makefile.am b/libgtkpod/Makefile.am
index f49667c..2e23e3f 100644
--- a/libgtkpod/Makefile.am
+++ b/libgtkpod/Makefile.am
@@ -56,13 +56,15 @@ libgtkpod_la_LIBADD = \
$(LIBGTKPOD_LIBS) \
@LIBOBJS@
-libgtkpodincludebase = $(includedir)/gtkpod-1.0
+libgtkpodincludebase = $(includedir)/gtkpod
libgtkpodincludedir = $(libgtkpodincludebase)/gtkpod
libgtkpodinclude_HEADERS = gp_itdb.h gtkpod_app_iface.h
INCLUDES=$(LIBGTKPOD_CFLAGS)
LIBS=$(LIBGTKPOD_LIBS) -lm
+EXTRA_DIST = gtkpod_app-marshallers.list
+
all-local: gtkpod_app-marshallers.h gtkpod_app-marshallers.c
gtkpod_app-marshallers.c: gtkpod_app-marshallers.list
diff --git a/plugins/Makefile.am b/plugins/Makefile.am
index 4fdaa09..c6c0bdc 100644
--- a/plugins/Makefile.am
+++ b/plugins/Makefile.am
@@ -12,6 +12,7 @@ SUBDIRS = . \
cover_display \
coverweb \
photo_editor \
- media_player
+ media_player \
+ mserv
# indent
diff --git a/plugins/photo_editor/Makefile.am b/plugins/photo_editor/Makefile.am
index d781fc9..b42e66d 100644
--- a/plugins/photo_editor/Makefile.am
+++ b/plugins/photo_editor/Makefile.am
@@ -3,19 +3,19 @@ plugin_lib = lib$(plugin_name).so
plugin_file = $(plugin_name).plugin
# Plugin UI file
-details_editor_uidir = $(gtkpod_ui_dir)
-details_editor_ui_DATA = $(plugin_name).ui
+photo_editor_uidir = $(gtkpod_ui_dir)
+photo_editor_ui_DATA = $(plugin_name).ui
# Plugin Glade file
-details_editor_gladedir = $(gtkpod_glade_dir)
-details_editor_glade_DATA = $(plugin_name).glade
+photo_editor_gladedir = $(gtkpod_glade_dir)
+photo_editor_glade_DATA = $(plugin_name).glade
# Plugin Icon file
-details_editor_pixmapsdir = $(gtkpod_image_dir)
-details_editor_pixmaps_DATA =
+photo_editor_pixmapsdir = $(gtkpod_image_dir)
+photo_editor_pixmaps_DATA =
-details_editor_plugindir = $(gtkpod_plugin_dir)
-details_editor_plugin_DATA = $(plugin_file)
+photo_editor_plugindir = $(gtkpod_plugin_dir)
+photo_editor_plugin_DATA = $(plugin_file)
SUBDIRS = icons
------------------------------------------------------------------------------
The Next 800 Companies to Lead America's Growth: New Video Whitepaper
David G. Thomson, author of the best-selling book "Blueprint to a
Billion" shares his insights and actions to help propel your
business during the next growth cycle. Listen Now!
http://p.sf.net/sfu/SAP-dev2dev
_______________________________________________
gtkpod-cvs2 mailing list
gtkpod-cvs2@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/gtkpod-cvs2
