[uim-commit] r2954 - branches/r5rs/uim

[yamaken at freedesktop.org]

Author: yamaken
Date: 2006-01-20 17:09:50 -0800 (Fri, 20 Jan 2006)
New Revision: 2954

Modified:
   branches/r5rs/uim/Makefile.am
   branches/r5rs/uim/uim-scm.c
Log:
* uim/Makefile.am
  - (libuim_la_LIBADD, libuim_la_CPPFLAGS): Follow the recent change
    of sigscheme directory structure
* uim/uim-scm.c
  - Ditto


Modified: branches/r5rs/uim/Makefile.am
===================================================================
--- branches/r5rs/uim/Makefile.am	2006-01-21 00:26:02 UTC (rev 2953)
+++ branches/r5rs/uim/Makefile.am	2006-01-21 01:09:50 UTC (rev 2954)
@@ -85,8 +85,12 @@
 libuimincludedir =  $(includedir)/uim
 
 libuim_la_LDFLAGS = -version-info $(libuim_version) -export-symbols-regex uim.\*
-libuim_la_LIBADD = @LTLIBINTL@ @LTLIBICONV@ $(top_builddir)/sigscheme/libsscm.la  $(top_builddir)/replace/libreplace.la
-libuim_la_CPPFLAGS = $(uim_defs) -I$(top_srcdir) -DPKGLIBDIR=\"$(pkglibdir)\" \
+libuim_la_LIBADD = @LTLIBINTL@ @LTLIBICONV@ \
+		   $(top_builddir)/sigscheme/src/libsscm.la \
+		   $(top_builddir)/replace/libreplace.la
+libuim_la_CPPFLAGS = $(uim_defs) \
+		     -I$(top_srcdir) -I$(top_srcdir)/sigscheme/src \
+		     -DPKGLIBDIR=\"$(pkglibdir)\" \
 		     -DPKGDATADIR=\"$(pkgdatadir)\"
 
 if DEBUG

Modified: branches/r5rs/uim/uim-scm.c
===================================================================
--- branches/r5rs/uim/uim-scm.c	2006-01-21 00:26:02 UTC (rev 2953)
+++ branches/r5rs/uim/uim-scm.c	2006-01-21 01:09:50 UTC (rev 2954)
@@ -37,8 +37,8 @@
 #include <stdlib.h>
 #include <string.h>
 #include <ctype.h>
-#include "sigscheme/sigscheme.h"
-#include "sigscheme/encoding.h"
+#include "sigscheme.h"
+#include "encoding.h"
 #include "uim-scm.h"
 #include "uim-compat-scm.h"
 #include "uim-internal.h"