diff options
| author | William Jon McCann <jmccann@redhat.com> | 2009-09-22 15:18:19 -0400 |
|---|---|---|
| committer | William Jon McCann <jmccann@redhat.com> | 2009-09-22 15:18:19 -0400 |
| commit | fb3e71b988e5400e45218883db036c0793507ee8 (patch) | |
| tree | 89e680ac52b1d7212666da81073e583df9a4601c | |
| parent | 53f7e0cc45b02af7fca5d2423e68aee4706caec0 (diff) | |
Fix build
| -rw-r--r-- | configure.ac | 28 | ||||
| -rw-r--r-- | src/Makefile.am | 2 | ||||
| -rw-r--r-- | src/theme.c | 29 |
3 files changed, 44 insertions, 15 deletions
diff --git a/configure.ac b/configure.ac index 39de48b..6379bcd 100644 --- a/configure.ac +++ b/configure.ac @@ -32,7 +32,33 @@ PKG_CHECK_MODULES(THEME, AC_PATH_PROG(GLIB_GENMARSHAL, glib-genmarshal) -EXTRA_COMPILE_WARNINGS(yes) +dnl --------------------------------------------------------------------------- +dnl Version information +dnl --------------------------------------------------------------------------- +THEME_MAJOR_VERSION=0 +THEME_MINOR_VERSION=1 +THEME_MICRO_VERSION=0 +THEME_DEVEL_VERSION=0 + +THEME_VERSION=$THEME_MAJOR_VERSION.$THEME_MINOR_VERSION.$THEME_MICRO_VERSION + +if test "x$THEME_DEVEL_VERSION" != "x0"; then + if test "x$THEME_MICRO_VERSION" = "x0"; then + THEME_MICRO_VERSION=$THEME_DEVEL_VERSION + THEME_VERSION=$THEME_MAJOR_VERSION.$THEME_MINOR_VERSION.$THEME_DEVEL_VERSION + else + THEME_VERSION=$THEME_VERSION.$THEME_DEVEL_VERSION + fi +fi + +AC_DEFINE_UNQUOTED(THEME_MAJOR_VERSION, $THEME_MAJOR_VERSION, + [theme major version.]) +AC_DEFINE_UNQUOTED(THEME_MINOR_VERSION, $THEME_MINOR_VERSION, + [theme minor version.]) +AC_DEFINE_UNQUOTED(THEME_MICRO_VERSION, $THEME_MICRO_VERSION, + [theme micro version.]) +AC_DEFINE_UNQUOTED(THEME_VERSION, "$THEME_VERSION", + [theme version.]) dnl --------------------------------------------------------------------------- dnl Finish diff --git a/src/Makefile.am b/src/Makefile.am index 61bab6b..ff3ccc3 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -3,6 +3,8 @@ NULL = enginedir = $(libdir)/notification-daemon-1.0/engines engine_LTLIBRARIES = libchelonia.la +AM_CPPFLAGS = $(THEME_CFLAGS) + libchelonia_la_SOURCES = theme.c libchelonia_la_LDFLAGS = -module -avoid-version diff --git a/src/theme.c b/src/theme.c index c551966..e3f7b2b 100644 --- a/src/theme.c +++ b/src/theme.c @@ -776,24 +776,25 @@ move_notification(GtkWidget *nw, int x, int y) void get_theme_info(char **theme_name, - char **theme_ver, - char **author, - char **homepage) + char **theme_ver, + char **author, + char **homepage) { - *theme_name = g_strdup("Standard"); + *theme_name = g_strdup("Chelonia"); *theme_ver = g_strdup_printf("%d.%d.%d", - NOTIFICATION_DAEMON_MAJOR_VERSION, - NOTIFICATION_DAEMON_MINOR_VERSION, - NOTIFICATION_DAEMON_MICRO_VERSION); - *author = g_strdup("Christian Hammond"); - *homepage = g_strdup("http://www.galago-project.org/"); + THEME_MAJOR_VERSION, + THEME_MINOR_VERSION, + THEME_MICRO_VERSION); + *author = g_strdup("William Jon McCann"); + *homepage = g_strdup("http://www.fedoraproject.org/"); } gboolean -theme_check_init(unsigned int major_ver, unsigned int minor_ver, - unsigned int micro_ver) +theme_check_init (unsigned int major_ver, + unsigned int minor_ver, + unsigned int micro_ver) { - return major_ver == NOTIFICATION_DAEMON_MAJOR_VERSION && - minor_ver == NOTIFICATION_DAEMON_MINOR_VERSION && - micro_ver == NOTIFICATION_DAEMON_MICRO_VERSION; + return major_ver == THEME_MAJOR_VERSION && + minor_ver == THEME_MINOR_VERSION && + micro_ver == THEME_MICRO_VERSION; } |