Author: yamakenz
Date: Thu Jun 14 18:12:57 2007
New Revision: 4599
Added:
sigscheme-trunk/sigscheme.mk.in
Modified:
sigscheme-trunk/Makefile.am
sigscheme-trunk/configure.in
sigscheme-trunk/src/Makefile.am
Log:
* sigscheme.mk.in
- New file for external packages such as uim
* Makefile.am
- (EXTRA_DIST): Add sigscheme.mk.in
* configure.in
- (SSCM_DEFS): New variable
- Add sigscheme.mk handling
* src/Makefile.am
- Replace DEFS with sigscheme.mk
Modified: sigscheme-trunk/Makefile.am
==============================================================================
--- sigscheme-trunk/Makefile.am (original)
+++ sigscheme-trunk/Makefile.am Thu Jun 14 18:12:57 2007
@@ -19,7 +19,8 @@
DIST_SUM_LIST = $(DIST_NAME).sum
EXTRA_DIST = \
- sigscheme.pc.in libgcroots.mk.in autogen.sh RELNOTE TODO QALog \
+ sigscheme.pc.in libgcroots.mk.in sigscheme.mk.in autogen.sh \
+ RELNOTE TODO QALog \
compare-scm.sh runbench.sh runtest.sh runtest-tail-rec.sh \
make-report.sh make-dist.sh
Modified: sigscheme-trunk/configure.in
==============================================================================
--- sigscheme-trunk/configure.in (original)
+++ sigscheme-trunk/configure.in Thu Jun 14 18:12:57 2007
@@ -984,6 +984,8 @@
#
scmlibdir='$(pkgdatadir)/lib'
AC_SUBST(scmlibdir)
+SSCM_DEFS='-DPKGDATADIR="\"$(pkgdatadir)\"" -DSCMLIBDIR="\"$(scmlibdir)\""'
+AC_SUBST(SSCM_DEFS)
###############################
# Output configuration result #
@@ -1004,6 +1006,7 @@
AC_CONFIG_FILES([sigscheme.pc
libgcroots.mk
+ sigscheme.mk
Makefile
doc/Makefile
m4/Makefile
Added: sigscheme-trunk/sigscheme.mk.in
==============================================================================
--- (empty file)
+++ sigscheme-trunk/sigscheme.mk.in Thu Jun 14 18:12:57 2007
@@ -0,0 +1,7 @@
+sscm_datadir = @datadir@
+sscm_scmlibdir = @scmlibdir@
+
+# Provides absolute directories to make being usable from superordinate
+# packages such as uim.
+SSCM_DEFS = @SSCM_DEFS@
+DEFS += $(SSCM_DEFS)
Modified: sigscheme-trunk/src/Makefile.am
==============================================================================
--- sigscheme-trunk/src/Makefile.am (original)
+++ sigscheme-trunk/src/Makefile.am Thu Jun 14 18:12:57 2007
@@ -1,7 +1,6 @@
include libtool-version.mk
include $(top_builddir)/libgcroots.mk
-
-DEFS += -DPKGDATADIR="\"$(pkgdatadir)\"" -DSCMLIBDIR="\"$(scmlibdir)\""
+include $(top_builddir)/sigscheme.mk
if USE_LIBSSCM
lib_LTLIBRARIES = libsscm.la
