pyrite-dev/sj4
12
2
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix build directory (issues 4)

Browse source
This commit is contained in:
iratqq 2010-02-14 13:47:35 +00:00
commit 32d1bcfa20
10 changed files with 23 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

4
trunk/dict/Makefile.am
View file

@ -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; \

2
trunk/lib/sj3core/Makefile.am
View file

@ -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 \

2
trunk/lib/sj3lib/Makefile.am
View file

@ -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 \

2
trunk/lib/sj3lua/Makefile.am
View file

@ -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

6
trunk/src/sj3demo/Makefile.am
View file

@ -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

4
trunk/src/sj3dic/Makefile.am
View file

@ -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 \

2
trunk/src/sj3mkdic/Makefile.am
View file

@ -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 \

7
trunk/src/sj3proxy/Makefile.am
View file

@ -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

11
trunk/src/sj3serv/Makefile.am
View file

@ -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

4
trunk/src/sj3stat/Makefile.am
View file

@ -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