svnno****@sourc*****
svnno****@sourc*****
Sun Apr 15 00:15:52 JST 2007
Revision: 3190
http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=kazehakase&view=rev&rev=3190
Author: kous
Date: 2007-04-15 00:15:51 +0900 (Sun, 15 Apr 2007)
Log Message:
-----------
supported building libkazehakase-X.dll.
* src/generate-def.mk: added.
* src/Makefile.am, src/actions/Makefile.am, src/utils/Makefile.am:
supported automatically .def generation.
Modified Paths:
--------------
kazehakase/trunk/ChangeLog
kazehakase/trunk/src/Makefile.am
kazehakase/trunk/src/actions/Makefile.am
kazehakase/trunk/src/utils/Makefile.am
Added Paths:
-----------
kazehakase/trunk/src/generate-def.mk
Property Changed:
----------------
kazehakase/trunk/module/embed/gecko/
kazehakase/trunk/module/search/
kazehakase/trunk/src/
kazehakase/trunk/src/actions/
kazehakase/trunk/src/utils/
Modified: kazehakase/trunk/ChangeLog
===================================================================
--- kazehakase/trunk/ChangeLog 2007-04-14 15:13:41 UTC (rev 3189)
+++ kazehakase/trunk/ChangeLog 2007-04-14 15:15:51 UTC (rev 3190)
@@ -1,5 +1,10 @@
2007-04-15 Kouhei Sutou <kou****@cozmi*****>
+ * src/generate-def.mk: added.
+
+ * src/Makefile.am, src/actions/Makefile.am, src/utils/Makefile.am:
+ supported automatically .def generation.
+
* src/actions/kz-bookmark-action.c: implemented empty class.
* src/utils/utils.[ch]
Property changes on: kazehakase/trunk/module/embed/gecko
___________________________________________________________________
Name: svn:ignore
- Makefile
Makefile.in
.libs
.deps
+ Makefile
Makefile.in
.libs
.deps
*.loT
Property changes on: kazehakase/trunk/module/search
___________________________________________________________________
Name: svn:ignore
- Makefile
Makefile.in
.libs
.deps
+ Makefile
Makefile.in
.libs
.deps
*.loT
Property changes on: kazehakase/trunk/src
___________________________________________________________________
Name: svn:ignore
- Makefile
Makefile.in
.deps
.libs
*.o
*.lo
*.la
*.bak
*~
*.rej
*.orig
kazehakase
kz-marshalers.c
kz-marshalers.h
*-enum-types[.-]c
*-enum-types[.-]h
+ Makefile
Makefile.in
.deps
.libs
*.o
*.lo
*.la
*.bak
*~
*.rej
*.orig
kazehakase
kz-marshalers.c
kz-marshalers.h
*-enum-types[.-]c
*-enum-types[.-]h
*.def
kazehakase-icon.ico
kazehakase.exe
kazehakase.rc
kazehakase.res
Modified: kazehakase/trunk/src/Makefile.am
===================================================================
--- kazehakase/trunk/src/Makefile.am 2007-04-14 15:13:41 UTC (rev 3189)
+++ kazehakase/trunk/src/Makefile.am 2007-04-14 15:15:51 UTC (rev 3190)
@@ -39,10 +39,25 @@
EXTRA_DIST = \
kz-marshalers.list
-marshal_sources = \
+enum_source_prefix = kz-enum-types
+
+enum_sources = \
+ kz-enum-types.c kz-enum-types.h
+
+enum_sources_h = \
+ $(libkazehakase_public_h_sources)
+
+marshal_sources = \
kz-marshalers.c kz-marshalers.h
+BUILT_SOURCES = \
+ $(marshal_sources) \
+ $(enum_sources)
+CLEANFILES = \
+ $(marshal_sources) \
+ $(enum_sources)
+
bin_PROGRAMS = kazehakase
dist_kazehakase_SOURCES = \
@@ -50,15 +65,50 @@
if HAVE_WINDRES
KAZEHAKASE_RES = kazehakase.res
+
+BUILT_SOURCES += \
+ kazehakase.rc \
+ kazehakase.res
+
+CLEANFILES += \
+ kazehakase.rc \
+ kazehakase.res
+
kazehakase.rc:
echo "KAZEHAKASE ICON kazehakase-icon.ico" > kazehakase.rc
kazehakase.res: kazehakase.rc
cp $(top_srcdir)/data/icons/kazehakase-icon.ico $(top_builddir)/src/
$(WINDRES) $< -O coff -o $@
else
-KASEHAKASE_RES =
+KASEHAKASE_RES =
endif
+if OS_WIN32
+export_symbols = -export-symbols kazehakase.def
+kazehakase_def_dependency = kazehakase.def
+BUILT_SOURCES += kazehakase.def
+CLEANFILES += kazehakase.def
+else
+export_symbols =
+kazehakase_def_dependency =
+endif
+
+def_prefix = libkazehakase
+def_sources = $(libkazehakase_public_h_sources)
+
+kazehakase_def_sources = \
+ $(top_builddir)/src/libkazehakase.def \
+ $(top_builddir)/src/actions/kzactions.def \
+ $(top_builddir)/src/utils/kzutils.def
+
+kazehakase.def: $(kazehakase_def_sources)
+ ( \
+ echo EXPORTS; \
+ cat $(kazehakase_def_sources) | sort; \
+ echo LIBRARY libkazehakase-$(LT_CURRENT_MINUS_AGE).dll; \
+ ) >$@
+ ! grep -q kazehakase_ERROR $@ || ($(RM) $@; false)
+
kazehakase_LDADD = libkazehakase.la $(KAZEHAKASE_RES)
if WITH_GECKO
@@ -100,14 +150,6 @@
kz-migemo.h \
kz-ext.h
-enum_source_prefix = kz-enum-types
-
-enum_sources = \
- kz-enum-types.c kz-enum-types.h
-
-enum_sources_h = \
- $(libkazehakase_public_h_sources)
-
libkazehakase_la_SOURCES = \
kz-app.c \
kz-module.c \
@@ -162,13 +204,12 @@
$(top_builddir)/src/libegg/pixbufthumbnail/libeggpixbufthumbnail.la \
$(top_builddir)/src/libegg/md5/libeggmd5.la
-BUILT_SOURCES = \
- $(marshal_sources) \
- $(enum_sources)
+libkazehakase_la_LDFLAGS = \
+ -version-info $(LT_VERSION_INFO) \
+ -no-undefined \
+ $(export_symbols)
-CLEANFILES = \
- $(marshal_sources) \
- $(enum_sources)
+libkazehakase_la_DEPENDENCIES = $(kazehakase_def_dependency)
kz-marshalers.h : kz-marshalers.list $(GLIB_GENMARSHAL)
$(GLIB_GENMARSHAL) $(top_srcdir)/src/kz-marshalers.list --header --prefix=_kz_marshal > $@
@@ -179,3 +220,4 @@
include $(top_srcdir)/src/enum-types.mk
+include $(top_srcdir)/src/generate-def.mk
Property changes on: kazehakase/trunk/src/actions
___________________________________________________________________
Name: svn:ignore
- Makefile
Makefile.in
.deps
.libs
*.o
*.lo
*.la
*.bak
*.rej
*.orig
*~
*-enum-types[.-]c
*-enum-types[.-]h
+ Makefile
Makefile.in
.deps
.libs
*.o
*.lo
*.la
*.bak
*.rej
*.orig
*~
*-enum-types[.-]c
*-enum-types[.-]h
*.def
Modified: kazehakase/trunk/src/actions/Makefile.am
===================================================================
--- kazehakase/trunk/src/actions/Makefile.am 2007-04-14 15:13:41 UTC (rev 3189)
+++ kazehakase/trunk/src/actions/Makefile.am 2007-04-14 15:15:51 UTC (rev 3190)
@@ -2,6 +2,9 @@
noinst_LTLIBRARIES = libkzactions.la
+BUILT_SOURCES =
+CLEANFILES =
+
AM_CPPFLAGS = \
-DGTK_DISABLE_DEPRECATED=1 \
-DGDK_DISABLE_DEPRECATED=1 \
@@ -62,10 +65,8 @@
libkzactions_la_LIBADD = \
$(GTK_LIBS)
-BUILT_SOURCES = \
- $(enum_sources)
+def_prefix = kzactions
+def_sources = $(libkzactions_public_h_sources)
-CLEANFILES = \
- $(enum_sources)
-
include $(top_srcdir)/src/enum-types.mk
+include $(top_srcdir)/src/generate-def.mk
Added: kazehakase/trunk/src/generate-def.mk
===================================================================
--- kazehakase/trunk/src/generate-def.mk 2007-04-14 15:13:41 UTC (rev 3189)
+++ kazehakase/trunk/src/generate-def.mk 2007-04-14 15:15:51 UTC (rev 3190)
@@ -0,0 +1,22 @@
+# -*- Mode: Makefile; tab-width: 8; indent-tabs-mode: t; -*-
+
+if OS_WIN32
+BUILT_SOURCES += \
+ $(def_prefix).def
+
+CLEANFILES += \
+ $(def_prefix).def
+endif
+
+$(def_prefix).def: $(def_sources)
+ ((cd $(srcdir); \
+ cat $(def_sources) || \
+ echo 'kazehakase_ERROR ()') | \
+ grep -v -E '^# *include' | \
+ ($(CC) $(CPPFLAGS) -E - || echo 'kazehakase_ERROR ()') | \
+ grep -E 'kz_.*[ ]\(' | \
+ sed -e 's/^.*[* ]\(kz_[^ ]\+\).*/\1/' | \
+ grep -v -E '^kz_module_impl_' | \
+ sort; \
+ ) >$@
+ ! grep -q kazehakase_ERROR $@ || ($(RM) $@; false)
Property changes on: kazehakase/trunk/src/utils
___________________________________________________________________
Name: svn:ignore
- Makefile
Makefile.in
.deps
.libs
*.o
*.lo
*.la
*.bak
*.rej
*.orig
*~
+ Makefile
Makefile.in
.deps
.libs
*.o
*.lo
*.la
*.bak
*.rej
*.orig
*~
*.def
Modified: kazehakase/trunk/src/utils/Makefile.am
===================================================================
--- kazehakase/trunk/src/utils/Makefile.am 2007-04-14 15:13:41 UTC (rev 3189)
+++ kazehakase/trunk/src/utils/Makefile.am 2007-04-14 15:15:51 UTC (rev 3190)
@@ -3,6 +3,10 @@
if GLIB_HAS_NO_REGEX
SUBDIRS = pcre
endif
+
+BUILT_SOURCES =
+CLEANFILES =
+
noinst_LTLIBRARIES = libkzutils.la
INCLUDES = \
@@ -17,14 +21,18 @@
-DG_LOG_DOMAIN=\"Kazehakase-Utils\" \
-DG_DISABLE_DEPRECATED=1
-libkzutils_la_SOURCES = \
- glib-utils.c glib-utils.h \
- gtk-utils.c gtk-utils.h \
- gobject-utils.h \
- kz-base64.h kz-base64.c \
- kz-history-utils.h kz-history-utils.c \
- utils.c utils.h
+libkzutils_public_h_sources = \
+ utils.h
+libkzutils_la_SOURCES = \
+ glib-utils.c glib-utils.h \
+ gtk-utils.c gtk-utils.h \
+ gobject-utils.h \
+ kz-base64.h kz-base64.c \
+ kz-history-utils.h kz-history-utils.c \
+ utils.c \
+ $(libkzutils_public_h_sources)
+
if GLIB_HAS_NO_REGEX
libkzutils_la_SOURCES += gregex.c gregex.h \
gscripttable.h
@@ -35,3 +43,8 @@
libkzutils_la_LIBADD = \
$(GTK_LIBS) \
$(LIBPCRE)
+
+def_prefix = kzutils
+def_sources = $(libkzutils_public_h_sources)
+
+include $(top_srcdir)/src/generate-def.mk