svnno****@sourc*****
svnno****@sourc*****
Mon Jan 26 10:48:51 JST 2009
Revision: 3571
http://svn.sourceforge.jp/view?root=kazehakase&view=rev&rev=3571
Author: ikezoe
Date: 2009-01-26 10:48:51 +0900 (Mon, 26 Jan 2009)
Log Message:
-----------
define KAZEHAKASE_CFLAGS.
Modified Paths:
--------------
kazehakase/trunk/ChangeLog
kazehakase/trunk/configure.ac
kazehakase/trunk/src/Makefile.am
kazehakase/trunk/src/actions/Makefile.am
kazehakase/trunk/src/bookmarks/Makefile.am
kazehakase/trunk/src/dialogs/Makefile.am
kazehakase/trunk/src/net/Makefile.am
kazehakase/trunk/src/prefs_ui/Makefile.am
kazehakase/trunk/src/sidebar/Makefile.am
kazehakase/trunk/src/utils/Makefile.am
kazehakase/trunk/src/utils/utils.c
kazehakase/trunk/src/widget/Makefile.am
Property Changed:
----------------
kazehakase/trunk/
Property changes on: kazehakase/trunk
___________________________________________________________________
Modified: svn:ignore
- aclocal.m4
autom4te.cache
config.guess
config.h
config.h.in
config.log
config.status
config.sub
configure
depcomp
compile
install-sh
intltool-extract
intltool-extract.in
intltool-merge
intltool-merge.in
intltool-update
intltool-update.in
libtool
ltmain.sh
Makefile
Makefile.in
missing
mkinstalldirs
stamp-h
stamp-h*
kazehakase.spec
*.bak
*~
*.rej
*.orig
.gdb_history
config.rpath
+ aclocal.m4
autom4te.cache
config.guess
config.h
config.h.in
config.log
config.status
config.sub
configure
depcomp
compile
install-sh
intltool-extract
intltool-extract.in
intltool-merge
intltool-merge.in
intltool-update
intltool-update.in
libtool
ltmain.sh
Makefile
Makefile.in
missing
mkinstalldirs
stamp-h
stamp-h*
kazehakase.spec
*.bak
*~
*.rej
*.orig
.gdb_history
config.rpath
coverage
coverage.info
Modified: kazehakase/trunk/ChangeLog
===================================================================
--- kazehakase/trunk/ChangeLog 2009-01-26 00:58:16 UTC (rev 3570)
+++ kazehakase/trunk/ChangeLog 2009-01-26 01:48:51 UTC (rev 3571)
@@ -1,3 +1,7 @@
+2009-01-26 Hiroyuki Ikezoe <poinc****@ikezo*****>
+
+ * define KAZEHAKASE_CFLAGS.
+
2009-01-25 Hiroyuki Ikezoe <poinc****@ikezo*****>
* src/bookmarks/kz-bookmark-separator.[ch]: Added.
Modified: kazehakase/trunk/configure.ac
===================================================================
--- kazehakase/trunk/configure.ac 2009-01-26 00:58:16 UTC (rev 3570)
+++ kazehakase/trunk/configure.ac 2009-01-26 01:48:51 UTC (rev 3571)
@@ -586,6 +586,20 @@
m4_ifdef([AC_CHECK_COVERAGE], [AC_CHECK_COVERAGE])
GENHTML_OPTIONS="--title 'Kazehakase Code Coverage'"
+KAZEHAKASE_CFLAGS="$GTK_CFLAGS $LIBGNUTLS_CFLAGS"
+KAZEHAKASE_CFLAGS="$KAZEHAKASE_CFLAGS -DGDK_DISABLE_DEPRECATED -DGTK_DISABLE_DEPRECATED"
+KAZEHAKASE_CFLAGS="$KAZEHAKASE_CFLAGS -DG_DISABLE_DEPRECATED"
+KAZEHAKASE_CFLAGS="$KAZEHAKASE_CFLAGS -DDATADIR=\\\"\"\$(datadir)\"\\\""
+KAZEHAKASE_CFLAGS="$KAZEHAKASE_CFLAGS -DLOCALEDIR=\\\"\"\$(localedir)\"\\\""
+KAZEHAKASE_CFLAGS="$KAZEHAKASE_CFLAGS -DKZ_DATADIR=\\\"\"\$(datadir)/\$(PACKAGE)\"\\\""
+KAZEHAKASE_CFLAGS="$KAZEHAKASE_CFLAGS -DKZ_SYSCONFDIR=\\\"\"\$(sysconfdir)/\$(PACKAGE)\"\\\""
+KAZEHAKASE_CFLAGS="$KAZEHAKASE_CFLAGS -DKZ_LIBDIR=\\\"\"\$(kzlibdir)\"\\\""
+KAZEHAKASE_CFLAGS="$KAZEHAKASE_CFLAGS -DKZ_EXTDIR=\\\"\"\$(kzextdir)\"\\\""
+KAZEHAKASE_CFLAGS="$KAZEHAKASE_CFLAGS -DKZ_RUBY_EXTDIR=\\\"\"\$(extrubydir)\"\\\""
+KAZEHAKASE_CFLAGS="$KAZEHAKASE_CFLAGS -DKZ_SEARCH_MODULEDIR=\\\"\"\$(searchdir)\"\\\""
+KAZEHAKASE_CFLAGS="$KAZEHAKASE_CFLAGS -DKZ_EMBED_MODULEDIR=\\\"\"\$(embeddir)\"\\\""
+AC_SUBST(KAZEHAKASE_CFLAGS)
+
AC_SUBST([AM_CPPFLAGS])
AC_SUBST([AM_CFLAGS])
AC_SUBST([AM_CXXFLAGS])
Modified: kazehakase/trunk/src/Makefile.am
===================================================================
--- kazehakase/trunk/src/Makefile.am 2009-01-26 00:58:16 UTC (rev 3570)
+++ kazehakase/trunk/src/Makefile.am 2009-01-26 01:48:51 UTC (rev 3571)
@@ -3,29 +3,15 @@
SUBDIRS = missing utils net actions bookmarks dialogs \
widget prefs_ui sidebar libegg
-
libkazehakasedir = $(libdir)/$(PACKAGE)
libkazehakase_LTLIBRARIES = libkazehakase.la
-AM_CPPFLAGS = \
- -DLOCALEDIR=\""$(localedir)"\" \
- -DSYSCONFDIR=\""$(sysconfdir)"\" \
- -DDATADIR=\""$(datadir)"\" \
- -DKZ_LIBDIR=\""$(kzlibdir)"\" \
- -DKZ_EXTDIR=\""$(extdir)"\" \
- -DKZ_RUBY_EXTDIR=\""$(extrubydir)"\" \
- -DKZ_SYSCONFDIR=\""$(sysconfdir)/$(PACKAGE)"\" \
- -DKZ_DATADIR=\""$(datadir)/$(PACKAGE)"\" \
- -DKZ_SEARCH_MODULEDIR=\""$(searchdir)"\" \
- -DKZ_EMBED_MODULEDIR=\""$(embeddir)"\" \
- -DGTK_DISABLE_DEPRECATED=1 \
- -DGDK_DISABLE_DEPRECATED=1 \
- -DG_LOG_DOMAIN=\"Kazehakase\" \
- -DG_DISABLE_DEPRECATED=1
+AM_CFLAGS = \
+ $(COVERAGE_CFLAGS) \
+ $(KAZEHAKASE_CFLAGS) \
+ -DG_LOG_DOMAIN=\"Kazehakase\"
INCLUDES = \
- $(GTK_CFLAGS) \
- $(LIBGNUTLS_CFLAGS) \
-I$(top_srcdir)/src/actions \
-I$(top_srcdir)/src/bookmarks \
-I$(top_srcdir)/src/libegg/pixbufthumbnail \
@@ -56,7 +42,8 @@
CLEANFILES = \
$(marshal_sources) \
- $(enum_sources)
+ $(enum_sources) \
+ *.gcno *.gcda
bin_PROGRAMS = kazehakase
Modified: kazehakase/trunk/src/actions/Makefile.am
===================================================================
--- kazehakase/trunk/src/actions/Makefile.am 2009-01-26 00:58:16 UTC (rev 3570)
+++ kazehakase/trunk/src/actions/Makefile.am 2009-01-26 01:48:51 UTC (rev 3571)
@@ -5,11 +5,9 @@
BUILT_SOURCES =
CLEANFILES =
-AM_CPPFLAGS = \
- -DGTK_DISABLE_DEPRECATED=1 \
- -DGDK_DISABLE_DEPRECATED=1 \
- -DG_LOG_DOMAIN=\"Kazehakase-Actions\" \
- -DG_DISABLE_DEPRECATED=1
+AM_CFLAGS = \
+ $(KAZEHAKASE_CFLAGS) \
+ -DG_LOG_DOMAIN=\"Kazehakase-Actions\"
INCLUDES = \
$(GTK_CFLAGS) \
Modified: kazehakase/trunk/src/bookmarks/Makefile.am
===================================================================
--- kazehakase/trunk/src/bookmarks/Makefile.am 2009-01-26 00:58:16 UTC (rev 3570)
+++ kazehakase/trunk/src/bookmarks/Makefile.am 2009-01-26 01:48:51 UTC (rev 3571)
@@ -3,7 +3,6 @@
noinst_LTLIBRARIES = libkzbookmarks.la
INCLUDES = \
- $(GTK_CFLAGS) \
-I$(top_builddir)/src \
-I$(top_srcdir)/src/actions \
-I$(top_srcdir)/src/utils \
@@ -13,16 +12,10 @@
-I$(top_srcdir)/src/libegg/pixbufthumbnail \
-I$(top_srcdir)/src
-AM_CPPFLAGS= \
- -DGTK_DISABLE_DEPRECATED=1 \
- -DGDK_DISABLE_DEPRECATED=1 \
- -DG_LOG_DOMAIN=\"Kazehakase-Bookmarks\" \
- -DG_DISABLE_DEPRECATED=1 \
- -DLOCALEDIR=\""$(localedir)"\" \
- -DSYSCONFDIR=\""$(sysconfdir)"\" \
- -DDATADIR=\""$(datadir)"\" \
- -DKZ_SYSCONFDIR=\""$(sysconfdir)/$(PACKAGE)"\" \
- -DKZ_DATADIR=\""$(datadir)/$(PACKAGE)"\"
+AM_CFLAGS = \
+ $(KAZEHAKASE_CFLAGS) \
+ $(COVERAGE_CFLAGS) \
+ -DG_LOG_DOMAIN=\"Kazehakase-Bookmarks\"
libkzbookmarks_public_h_sources = \
kz-bookmark.h \
@@ -104,7 +97,8 @@
BUILT_SOURCES = \
$(enum_sources)
-CLEANFILES = \
- $(enum_sources)
+CLEANFILES = \
+ $(enum_sources) \
+ *.gcno *.gcda
include $(top_srcdir)/src/enum-types.mk
Modified: kazehakase/trunk/src/dialogs/Makefile.am
===================================================================
--- kazehakase/trunk/src/dialogs/Makefile.am 2009-01-26 00:58:16 UTC (rev 3570)
+++ kazehakase/trunk/src/dialogs/Makefile.am 2009-01-26 01:48:51 UTC (rev 3571)
@@ -11,12 +11,9 @@
-I$(top_srcdir)/src/libegg/pixbufthumbnail \
-I$(top_srcdir)/src
-AM_CPPFLAGS= \
- -DKZ_DATADIR=\""$(datadir)/$(PACKAGE)"\" \
- -DGTK_DISABLE_DEPRECATED=1 \
- -DGDK_DISABLE_DEPRECATED=1 \
- -DG_LOG_DOMAIN=\"Kazehakase-Dialogs\" \
- -DG_DISABLE_DEPRECATED=1
+AM_CFLAGS = \
+ $(KAZEHAKASE_CFLAGS) \
+ -DG_LOG_DOMAIN=\"Kazehakase-Dialogs\"
libkzdialogs_public_h_sources = \
kz-about-dialog.h \
Modified: kazehakase/trunk/src/net/Makefile.am
===================================================================
--- kazehakase/trunk/src/net/Makefile.am 2009-01-26 00:58:16 UTC (rev 3570)
+++ kazehakase/trunk/src/net/Makefile.am 2009-01-26 01:48:51 UTC (rev 3571)
@@ -10,15 +10,11 @@
-I$(top_srcdir)/src/libegg/md5 \
-I$(top_srcdir)/src/utils \
-I$(top_srcdir)/src/missing \
- -I$(top_srcdir)/src/libegg/pixbufthumbnail \
- $(GTK_CFLAGS) \
- $(LIBGNUTLS_CFLAGS)
+ -I$(top_srcdir)/src/libegg/pixbufthumbnail
-AM_CPPFLAGS= \
- -DGTK_DISABLE_DEPRECATED=1 \
- -DGDK_DISABLE_DEPRECATED=1 \
- -DG_LOG_DOMAIN=\"Kazehakase-Net\" \
- -DG_DISABLE_DEPRECATED=1
+AM_CFLAGS = \
+ $(KAZEHAKASE_CFLAGS) \
+ -DG_LOG_DOMAIN=\"Kazehakase-Net\"
libkznet_public_h_sources = \
kz-io.h \
Modified: kazehakase/trunk/src/prefs_ui/Makefile.am
===================================================================
--- kazehakase/trunk/src/prefs_ui/Makefile.am 2009-01-26 00:58:16 UTC (rev 3570)
+++ kazehakase/trunk/src/prefs_ui/Makefile.am 2009-01-26 01:48:51 UTC (rev 3571)
@@ -10,11 +10,9 @@
-I$(top_srcdir)/src/libegg/pixbufthumbnail \
-I$(top_srcdir)/src
-AM_CPPFLAGS = \
- -DGTK_DISABLE_DEPRECATED=1 \
- -DGDK_DISABLE_DEPRECATED=1 \
- -DG_LOG_DOMAIN=\"Kazehakase-PrefsUI\" \
- -DG_DISABLE_DEPRECATED=1
+AM_CFLAGS = \
+ $(KAZEHAKASE_CFLAGS) \
+ -DG_LOG_DOMAIN=\"Kazehakase-PrefsUI\"
libkzprefsui_public_h_sources = \
prefs_entry.h \
Modified: kazehakase/trunk/src/sidebar/Makefile.am
===================================================================
--- kazehakase/trunk/src/sidebar/Makefile.am 2009-01-26 00:58:16 UTC (rev 3570)
+++ kazehakase/trunk/src/sidebar/Makefile.am 2009-01-26 01:48:51 UTC (rev 3571)
@@ -3,7 +3,6 @@
noinst_LTLIBRARIES = libkzsidebar.la
INCLUDES = \
- $(GTK_CFLAGS) \
-I$(top_srcdir)/src/actions \
-I$(top_srcdir)/src/utils \
-I$(top_srcdir)/src/mozilla \
@@ -13,11 +12,9 @@
-I$(top_srcdir)/src/libegg/pixbufthumbnail \
-I$(top_srcdir)/src
-AM_CPPFLAGS= \
- -DGTK_DISABLE_DEPRECATED=1 \
- -DGDK_DISABLE_DEPRECATED=1 \
- -DG_LOG_DOMAIN=\"Kazehakase-Sidebar\" \
- -DG_DISABLE_DEPRECATED=1
+AM_CFLAGS = \
+ $(KAZEHAKASE_CFLAGS) \
+ -DG_LOG_DOMAIN=\"Kazehakase-Sidebar\"
libkzsidebar_public_h_sources = \
kz-bookmarks-sidebar.h \
Modified: kazehakase/trunk/src/utils/Makefile.am
===================================================================
--- kazehakase/trunk/src/utils/Makefile.am 2009-01-26 00:58:16 UTC (rev 3570)
+++ kazehakase/trunk/src/utils/Makefile.am 2009-01-26 01:48:51 UTC (rev 3571)
@@ -6,16 +6,13 @@
noinst_LTLIBRARIES = libkzutils.la
INCLUDES = \
- $(GTK_CFLAGS) \
-I$(top_srcdir)/src \
-I$(top_srcdir)/src/bookmarks \
-I$(top_srcdir)/src/libegg/pixbufthumbnail
-AM_CPPFLAGS= \
- -DGTK_DISABLE_DEPRECATED=1 \
- -DGDK_DISABLE_DEPRECATED=1 \
- -DG_LOG_DOMAIN=\"Kazehakase-Utils\" \
- -DG_DISABLE_DEPRECATED=1
+AM_CFLAGS = \
+ $(KAZEHAKASE_CFLAGS) \
+ -DG_LOG_DOMAIN=\"Kazehakase-Utils\"
libkzutils_public_h_sources = \
utils.h
Modified: kazehakase/trunk/src/utils/utils.c
===================================================================
--- kazehakase/trunk/src/utils/utils.c 2009-01-26 00:58:16 UTC (rev 3570)
+++ kazehakase/trunk/src/utils/utils.c 2009-01-26 01:48:51 UTC (rev 3571)
@@ -639,7 +639,6 @@
return;
}
-
fd = g_file_open_tmp("kzXXXXXX", &tmp_file, NULL);
if (fd == -1)
return;
Modified: kazehakase/trunk/src/widget/Makefile.am
===================================================================
--- kazehakase/trunk/src/widget/Makefile.am 2009-01-26 00:58:16 UTC (rev 3570)
+++ kazehakase/trunk/src/widget/Makefile.am 2009-01-26 01:48:51 UTC (rev 3571)
@@ -3,13 +3,13 @@
noinst_LTLIBRARIES = libkzwidget.la
INCLUDES = \
- $(GTK_CFLAGS) \
-I$(top_srcdir)/src \
-I$(top_srcdir)/src/bookmarks \
-I$(top_srcdir)/src/libegg/pixbufthumbnail \
-I$(top_srcdir)/src/utils
-AM_CPPFLAGS= \
+AM_CFLAGS = \
+ $(KAZEHAKASE_CFLAGS) \
-DG_LOG_DOMAIN=\"Kazehakase-Widget\"
libkzwidget_public_h_sources = \