From 32d1bcfa204716df0e3bdd3cc586c700e559997f Mon Sep 17 00:00:00 2001 From: iratqq Date: Sun, 14 Feb 2010 13:47:35 +0000 Subject: [PATCH] fix build directory (issues 4) --- trunk/dict/Makefile.am | 4 ++-- trunk/lib/sj3core/Makefile.am | 2 +- trunk/lib/sj3lib/Makefile.am | 2 +- trunk/lib/sj3lua/Makefile.am | 2 +- trunk/src/sj3demo/Makefile.am | 6 +++--- trunk/src/sj3dic/Makefile.am | 4 ++-- trunk/src/sj3mkdic/Makefile.am | 2 +- trunk/src/sj3proxy/Makefile.am | 7 ++++--- trunk/src/sj3serv/Makefile.am | 11 ++++++----- trunk/src/sj3stat/Makefile.am | 4 ++-- 10 files changed, 23 insertions(+), 21 deletions(-) diff --git a/trunk/dict/Makefile.am b/trunk/dict/Makefile.am index cba4a5c..f199b3c 100644 --- a/trunk/dict/Makefile.am +++ b/trunk/dict/Makefile.am @@ -5,9 +5,9 @@ EXTRA_DIST = visual.dic all: sj3main.dic sj3main.dic: visual.dic - $(top_srcdir)/src/sj3mkdic/sj3mkdic ./visual.dic sj3main.dic > Moutput + $(top_builddir)/src/sj3mkdic/sj3mkdic ./visual.dic sj3main.dic > Moutput -install:: +install:: sj3main.dic ($(mkdir_p) $(DESTDIR)$(SJ3DICTDIR); \ $(INSTALL_DATA) sj3main.dic $(DESTDIR)$(SJ3DICTDIR); \ $(mkdir_p) $(DESTDIR)$(SJ3DICTDIR)/user; \ diff --git a/trunk/lib/sj3core/Makefile.am b/trunk/lib/sj3core/Makefile.am index b385bcb..a1e64fd 100644 --- a/trunk/lib/sj3core/Makefile.am +++ b/trunk/lib/sj3core/Makefile.am @@ -7,7 +7,7 @@ INCLUDES = \ lib_LTLIBRARIES = libsj3core.la -libsj3core_la_LDFLAGS = $(top_srcdir)/lib/sj3compat/libsj3compat.la -version-info @LIBSJ3CORE_VERSION_INFO@ +libsj3core_la_LDFLAGS = $(top_builddir)/lib/sj3compat/libsj3compat.la -version-info @LIBSJ3CORE_VERSION_INFO@ libsj3core_la_SOURCES = \ adddic.c \ diff --git a/trunk/lib/sj3lib/Makefile.am b/trunk/lib/sj3lib/Makefile.am index 50e5fc7..3e169d9 100644 --- a/trunk/lib/sj3lib/Makefile.am +++ b/trunk/lib/sj3lib/Makefile.am @@ -7,7 +7,7 @@ INCLUDES = \ lib_LTLIBRARIES = libsj3lib.la -libsj3lib_la_LDFLAGS = $(top_srcdir)/lib/sj3compat/libsj3compat.la -version-info @LIBSJ3LIB_VERSION_INFO@ +libsj3lib_la_LDFLAGS = $(top_builddir)/lib/sj3compat/libsj3compat.la -version-info @LIBSJ3LIB_VERSION_INFO@ libsj3lib_la_SOURCES = \ level1.c \ diff --git a/trunk/lib/sj3lua/Makefile.am b/trunk/lib/sj3lua/Makefile.am index 4019a8d..c2eb33c 100644 --- a/trunk/lib/sj3lua/Makefile.am +++ b/trunk/lib/sj3lua/Makefile.am @@ -7,7 +7,7 @@ INCLUDES = \ AM_CFLAGS = $(lua_CFLAGS) if SJ3_INTERNAL_LUA -AM_CFLAGS += -I$(top_builddir)/lib/lua/src +AM_CFLAGS += -I$(top_srcdir)/lib/lua/src else AM_CFLAGS += $(LUA_CFLAGS) endif diff --git a/trunk/src/sj3demo/Makefile.am b/trunk/src/sj3demo/Makefile.am index 985e1cb..841d819 100644 --- a/trunk/src/sj3demo/Makefile.am +++ b/trunk/src/sj3demo/Makefile.am @@ -7,9 +7,9 @@ INCLUDES = \ -I$(top_srcdir)/include/sj3rkcv LDADD = \ - $(top_srcdir)/lib/sj3lib/libsj3lib.la \ - $(top_srcdir)/lib/sj3rkcv/libsj3rkcv.la \ - $(top_srcdir)/lib/sj3compat/libsj3compat.la + $(top_builddir)/lib/sj3lib/libsj3lib.la \ + $(top_builddir)/lib/sj3rkcv/libsj3rkcv.la \ + $(top_builddir)/lib/sj3compat/libsj3compat.la AM_CPPFLAGS= -DORG diff --git a/trunk/src/sj3dic/Makefile.am b/trunk/src/sj3dic/Makefile.am index 6dc3d29..d1bdc10 100644 --- a/trunk/src/sj3dic/Makefile.am +++ b/trunk/src/sj3dic/Makefile.am @@ -6,8 +6,8 @@ INCLUDES = \ -I$(top_srcdir)/include/sj3lib LDADD = \ - $(top_srcdir)/lib/sj3lib/libsj3lib.la \ - $(top_srcdir)/lib/sj3compat/libsj3compat.la + $(top_builddir)/lib/sj3lib/libsj3lib.la \ + $(top_builddir)/lib/sj3compat/libsj3compat.la sj3dic_SOURCES = \ sj3dic.h \ diff --git a/trunk/src/sj3mkdic/Makefile.am b/trunk/src/sj3mkdic/Makefile.am index 56f0764..d21c97f 100644 --- a/trunk/src/sj3mkdic/Makefile.am +++ b/trunk/src/sj3mkdic/Makefile.am @@ -5,7 +5,7 @@ INCLUDES = \ -I$(top_srcdir)/include/sj3common \ -I$(top_srcdir)/include/sj3core -LDADD = $(top_srcdir)/lib/sj3compat/libsj3compat.la +LDADD = $(top_builddir)/lib/sj3compat/libsj3compat.la sj3mkdic_SOURCES = \ GramTable \ diff --git a/trunk/src/sj3proxy/Makefile.am b/trunk/src/sj3proxy/Makefile.am index 4a5b4ff..74e5aa7 100644 --- a/trunk/src/sj3proxy/Makefile.am +++ b/trunk/src/sj3proxy/Makefile.am @@ -8,9 +8,9 @@ EXTRA_DIST = \ INCLUDES = \ -I$(top_srcdir)/include/sj3common \ -I$(top_srcdir)/include/sj3compat \ - -I$(top_srcdir)/include/sj3lua + -I$(top_srcdir)/include/sj3lua -LDADD = $(top_srcdir)/lib/sj3lua/libsj3lua.la +LDADD = $(top_builddir)/lib/sj3lua/libsj3lua.la AM_CFLAGS = $(lua_CFLAGS) @@ -22,7 +22,7 @@ AM_CFLAGS += $(LUA_CFLAGS) LDADD += $(LUA_LIBS) endif -LDADD += $(top_srcdir)/lib/sj3compat/libsj3compat.la +LDADD += $(top_builddir)/lib/sj3compat/libsj3compat.la exampledir = $(datadir)/examples/sj3 @@ -43,3 +43,4 @@ CLEANFILES = \ sj3proxy.lua.example endif + diff --git a/trunk/src/sj3serv/Makefile.am b/trunk/src/sj3serv/Makefile.am index 0ddd72e..601be9b 100644 --- a/trunk/src/sj3serv/Makefile.am +++ b/trunk/src/sj3serv/Makefile.am @@ -14,8 +14,8 @@ INCLUDES = \ -I$(top_srcdir)/include/sj3lua LDADD = \ - $(top_srcdir)/lib/sj3core/libsj3core.la \ - $(top_srcdir)/lib/sj3lua/libsj3lua.la + $(top_builddir)/lib/sj3core/libsj3core.la \ + $(top_builddir)/lib/sj3lua/libsj3lua.la if SJ3_INTERNAL_LUA AM_CFLAGS += -I$(top_builddir)/lib/lua/src @@ -25,7 +25,7 @@ AM_CFLAGS += $(LUA_CFLAGS) LDADD += $(LUA_LIBS) endif -LDADD += $(top_srcdir)/lib/sj3compat/libsj3compat.la +LDADD += $(top_builddir)/lib/sj3compat/libsj3compat.la exampledir = $(datadir)/examples/sj3 @@ -48,11 +48,12 @@ example_DATA = \ freebsd-sj3.sh.in \ sj3serv.lua.example -time_stamp.c: time_stamp.sh - sh ./time_stamp.sh > time_stamp.c +time_stamp.c: $(srcdir)/time_stamp.sh + sh $(srcdir)/time_stamp.sh > time_stamp.c CLEANFILES = \ sj3serv.lua.example \ time_stamp.c endif + diff --git a/trunk/src/sj3stat/Makefile.am b/trunk/src/sj3stat/Makefile.am index eb696bf..1f6591a 100644 --- a/trunk/src/sj3stat/Makefile.am +++ b/trunk/src/sj3stat/Makefile.am @@ -6,8 +6,8 @@ INCLUDES = \ -I$(top_srcdir)/include/sj3lib LDADD = \ - $(top_srcdir)/lib/sj3lib/libsj3lib.la \ - $(top_srcdir)/lib/sj3compat/libsj3compat.la + $(top_builddir)/lib/sj3lib/libsj3lib.la \ + $(top_builddir)/lib/sj3compat/libsj3compat.la sj3stat_SOURCES = sj3stat.c