<URL: http://bugs.freeciv.org/Ticket/Display.html?id=39527 >

 With these makefile changes toluaxx succesfully compiles and links
against included lua-5.1

 Or it would, if make would ever recurse in to lua-5.1 and toluaxx
directories. That part have to go in last (when we can actually use
toluaxx & lua-5.1).


 - ML

diff -Nurd -X.diff_ignore freeciv/dependencies/toluaxx/src/bin/Makefile.am freeciv/dependencies/toluaxx/src/bin/Makefile.am
--- freeciv/dependencies/toluaxx/src/bin/Makefile.am	2007-08-10 17:51:12.000000000 +0300
+++ freeciv/dependencies/toluaxx/src/bin/Makefile.am	2007-08-10 20:24:33.000000000 +0300
@@ -3,16 +3,17 @@
 noinst_PROGRAMS = tolua
 
 AM_CPPFLAGS = \
-	-I$(top_srcdir)/dependencies/lua/src/lib \
-	-I$(top_srcdir)/dependencies/lua/include \
-	-I$(top_srcdir)/dependencies/toluaxx/include \
-	-I.
+	-I$(top_srcdir)/dependencies/lua-5.1/src \
+	-I$(top_srcdir)/dependencies/lua-5.1/etc \
+	-I$(top_srcdir)/dependencies/toluaxx/include
 
 tolua_SOURCES = \
-	$(top_srcdir)/dependencies/tolua/include/toluaxx.h \
+	$(top_srcdir)/dependencies/toluaxx/include/toluaxx.h \
 	toluaxx.bind.cxx	\
 	main.cxx \
 	main.hxx \
+	help.cxx \
+	help.hxx \
 	parsecmd.cxx \
 	parsecmd.hxx \
 	platform.hxx
@@ -43,9 +44,9 @@
 	lua/tlx_verbatim.lua
 
 tolua_DEPENDENCIES = \
-	$(top_builddir)/dependencies/lua/src/liblua.a \
+	$(top_builddir)/dependencies/lua-5.1/src/liblua.a \
 	../lib/libtolua.a
 
 tolua_LDADD = \
-	$(top_builddir)/dependencies/lua/src/liblua.a \
+	$(top_builddir)/dependencies/lua-5.1/src/liblua.a \
 	../lib/libtolua.a -lm
diff -Nurd -X.diff_ignore freeciv/dependencies/toluaxx/src/lib/Makefile.am freeciv/dependencies/toluaxx/src/lib/Makefile.am
--- freeciv/dependencies/toluaxx/src/lib/Makefile.am	2007-08-06 05:50:56.000000000 +0300
+++ freeciv/dependencies/toluaxx/src/lib/Makefile.am	2007-08-10 20:24:30.000000000 +0300
@@ -1,11 +1,8 @@
-# SUBDIRS = none
-
 noinst_LIBRARIES = libtolua.a
 
 AM_CPPFLAGS = \
-	-I$(top_srcdir)/dependencies/lua/include \
 	-I$(top_srcdir)/dependencies/toluaxx/include \
-	-I.
+	-I$(top_srcdir)/dependencies/lua-5.1/src
 
 libtolua_a_SOURCES = \
 	$(top_srcdir)/dependencies/tolua/include/toluaxx.h \
_______________________________________________
Freeciv-dev mailing list
Freeciv-dev@gna.org
https://mail.gna.org/listinfo/freeciv-dev

Reply via email to