mail[Wesnoth-commits] r44998 - in /trunk: configure.ac src/Makefile.am src/lua/Makefile src/lua/Makefile.am


Others Months | Index by Date | Thread Index
>>   [Date Prev] [Date Next] [Thread Prev] [Thread Next]

Header


Content

Posted by guillaume . melquiond on July 31, 2010 - 14:50:
Author: silene
Date: Sat Jul 31 14:50:25 2010
New Revision: 44998

URL: http://svn.gna.org/viewcvs/wesnoth?rev=44998&view=rev
Log:
Added an autotool target, so that out-of-tree builds are possible again.

Added:
    trunk/src/lua/Makefile.am
Removed:
    trunk/src/lua/Makefile
Modified:
    trunk/configure.ac
    trunk/src/Makefile.am

Modified: trunk/configure.ac
URL: 
http://svn.gna.org/viewcvs/wesnoth/trunk/configure.ac?rev=44998&r1=44997&r2=44998&view=diff
==============================================================================
--- trunk/configure.ac (original)
+++ trunk/configure.ac Sat Jul 31 14:50:25 2010
@@ -1014,6 +1014,7 @@
                 m4/Makefile
                 icons/Makefile
                 src/Makefile
+                src/lua/Makefile
                 doc/Makefile
                 doc/man/Makefile
                 doc/manual/Makefile])

Modified: trunk/src/Makefile.am
URL: 
http://svn.gna.org/viewcvs/wesnoth/trunk/src/Makefile.am?rev=44998&r1=44997&r2=44998&view=diff
==============================================================================
--- trunk/src/Makefile.am (original)
+++ trunk/src/Makefile.am Sat Jul 31 14:50:25 2010
@@ -1,4 +1,5 @@
 AUTOMAKE_OPTIONS = subdir-objects
+SUBDIRS = lua
 
 bin_PROGRAMS =
 bin_SCRIPTS =
@@ -558,7 +559,7 @@
 endif
 
 lua/liblua.a:
-       $(MAKE) -C lua/ a CC="$(CXX)"
+       $(MAKE) -C lua/ liblua.a
 
 # Until game_config.cpp is removed, this will be needed to ensure that the
 # REVISION constant gets updated correctly.  If and when that definition is

Removed: trunk/src/lua/Makefile
URL: 
http://svn.gna.org/viewcvs/wesnoth/trunk/src/lua/Makefile?rev=44997&view=auto
==============================================================================
--- trunk/src/lua/Makefile (original)
+++ trunk/src/lua/Makefile (removed)
@@ -1,182 +1,0 @@
-# makefile for building Lua
-# see ../INSTALL for installation instructions
-# see ../Makefile and luaconf.h for further customization
-
-# == CHANGE THE SETTINGS BELOW TO SUIT YOUR ENVIRONMENT 
=======================
-
-# Your platform. See PLATS for possible values.
-PLAT= none
-
-CC= gcc
-CFLAGS= -O2 -Wall $(MYCFLAGS)
-AR= ar rcu
-RANLIB= ranlib
-RM= rm -f
-LIBS= -lm $(MYLIBS)
-
-MYCFLAGS=
-MYLDFLAGS=
-MYLIBS=
-
-# == END OF USER SETTINGS. NO NEED TO CHANGE ANYTHING BELOW THIS LINE 
=========
-
-PLATS= aix ansi bsd freebsd generic linux macosx mingw posix solaris
-
-LUA_A= liblua.a
-CORE_O=        lapi.o lcode.o ldebug.o ldo.o ldump.o lfunc.o lgc.o llex.o 
lmem.o \
-       lobject.o lopcodes.o lparser.o lstate.o lstring.o ltable.o ltm.o  \
-       lundump.o lvm.o lzio.o
-LIB_O= lauxlib.o lbaselib.o ldblib.o liolib.o lmathlib.o loslib.o ltablib.o \
-       lstrlib.o loadlib.o linit.o
-
-LUA_T= lua
-LUA_O= lua.o
-
-LUAC_T=        luac
-LUAC_O=        luac.o print.o
-
-ALL_O= $(CORE_O) $(LIB_O) $(LUA_O) $(LUAC_O)
-ALL_T= $(LUA_A) $(LUA_T) $(LUAC_T)
-ALL_A= $(LUA_A)
-
-default: $(PLAT)
-
-all:   $(ALL_T)
-
-o:     $(ALL_O)
-
-a:     $(ALL_A)
-
-$(LUA_A): $(CORE_O) $(LIB_O)
-       $(AR) $@ $?
-       $(RANLIB) $@
-
-$(LUA_T): $(LUA_O) $(LUA_A)
-       $(CC) -o $@ $(MYLDFLAGS) $(LUA_O) $(LUA_A) $(LIBS)
-
-$(LUAC_T): $(LUAC_O) $(LUA_A)
-       $(CC) -o $@ $(MYLDFLAGS) $(LUAC_O) $(LUA_A) $(LIBS)
-
-clean:
-       $(RM) $(ALL_T) $(ALL_O)
-
-depend:
-       @$(CC) $(CFLAGS) -MM l*.c print.c
-
-echo:
-       @echo "PLAT = $(PLAT)"
-       @echo "CC = $(CC)"
-       @echo "CFLAGS = $(CFLAGS)"
-       @echo "AR = $(AR)"
-       @echo "RANLIB = $(RANLIB)"
-       @echo "RM = $(RM)"
-       @echo "MYCFLAGS = $(MYCFLAGS)"
-       @echo "MYLDFLAGS = $(MYLDFLAGS)"
-       @echo "MYLIBS = $(MYLIBS)"
-
-# convenience targets for popular platforms
-
-none:
-       @echo "Please choose a platform:"
-       @echo "   $(PLATS)"
-
-aix:
-       $(MAKE) all CC="xlc" CFLAGS="-O2 -DLUA_USE_POSIX -DLUA_USE_DLOPEN" 
MYLIBS="-ldl" MYLDFLAGS="-brtl -bexpall"
-
-ansi:
-       $(MAKE) all MYCFLAGS=-DLUA_ANSI
-
-bsd:
-       $(MAKE) all MYCFLAGS="-DLUA_USE_POSIX -DLUA_USE_DLOPEN" 
MYLIBS="-Wl,-E"
-
-freebsd:
-       $(MAKE) all MYCFLAGS="-DLUA_USE_LINUX" MYLIBS="-Wl,-E -lreadline"
-
-generic:
-       $(MAKE) all MYCFLAGS=
-
-linux:
-       $(MAKE) all MYCFLAGS=-DLUA_USE_LINUX MYLIBS="-Wl,-E -ldl -lreadline 
-lhistory -lncurses"
-
-macosx:
-       $(MAKE) all MYCFLAGS=-DLUA_USE_LINUX MYLIBS="-lreadline"
-# use this on Mac OS X 10.3-
-#      $(MAKE) all MYCFLAGS=-DLUA_USE_MACOSX
-
-mingw:
-       $(MAKE) "LUA_A=lua51.dll" "LUA_T=lua.exe" \
-       "AR=$(CC) -shared -o" "RANLIB=strip --strip-unneeded" \
-       "MYCFLAGS=-DLUA_BUILD_AS_DLL" "MYLIBS=" "MYLDFLAGS=-s" lua.exe
-       $(MAKE) "LUAC_T=luac.exe" luac.exe
-
-posix:
-       $(MAKE) all MYCFLAGS=-DLUA_USE_POSIX
-
-solaris:
-       $(MAKE) all MYCFLAGS="-DLUA_USE_POSIX -DLUA_USE_DLOPEN" MYLIBS="-ldl"
-
-# list targets that do not create files (but not all makes understand .PHONY)
-.PHONY: all $(PLATS) default o a clean depend echo none
-
-# DO NOT DELETE
-
-lapi.o: lapi.c lua.h luaconf.h lapi.h lobject.h llimits.h ldebug.h \
-  lstate.h ltm.h lzio.h lmem.h ldo.h lfunc.h lgc.h lstring.h ltable.h \
-  lundump.h lvm.h
-lauxlib.o: lauxlib.c lua.h luaconf.h lauxlib.h
-lbaselib.o: lbaselib.c lua.h luaconf.h lauxlib.h lualib.h
-lcode.o: lcode.c lua.h luaconf.h lcode.h llex.h lobject.h llimits.h \
-  lzio.h lmem.h lopcodes.h lparser.h ldebug.h lstate.h ltm.h ldo.h lgc.h \
-  ltable.h
-ldblib.o: ldblib.c lua.h luaconf.h lauxlib.h lualib.h
-ldebug.o: ldebug.c lua.h luaconf.h lapi.h lobject.h llimits.h lcode.h \
-  llex.h lzio.h lmem.h lopcodes.h lparser.h ldebug.h lstate.h ltm.h ldo.h \
-  lfunc.h lstring.h lgc.h ltable.h lvm.h
-ldo.o: ldo.c lua.h luaconf.h ldebug.h lstate.h lobject.h llimits.h ltm.h \
-  lzio.h lmem.h ldo.h lfunc.h lgc.h lopcodes.h lparser.h lstring.h \
-  ltable.h lundump.h lvm.h
-ldump.o: ldump.c lua.h luaconf.h lobject.h llimits.h lstate.h ltm.h \
-  lzio.h lmem.h lundump.h
-lfunc.o: lfunc.c lua.h luaconf.h lfunc.h lobject.h llimits.h lgc.h lmem.h \
-  lstate.h ltm.h lzio.h
-lgc.o: lgc.c lua.h luaconf.h ldebug.h lstate.h lobject.h llimits.h ltm.h \
-  lzio.h lmem.h ldo.h lfunc.h lgc.h lstring.h ltable.h
-linit.o: linit.c lua.h luaconf.h lualib.h lauxlib.h
-liolib.o: liolib.c lua.h luaconf.h lauxlib.h lualib.h
-llex.o: llex.c lua.h luaconf.h ldo.h lobject.h llimits.h lstate.h ltm.h \
-  lzio.h lmem.h llex.h lparser.h lstring.h lgc.h ltable.h
-lmathlib.o: lmathlib.c lua.h luaconf.h lauxlib.h lualib.h
-lmem.o: lmem.c lua.h luaconf.h ldebug.h lstate.h lobject.h llimits.h \
-  ltm.h lzio.h lmem.h ldo.h
-loadlib.o: loadlib.c lua.h luaconf.h lauxlib.h lualib.h
-lobject.o: lobject.c lua.h luaconf.h ldo.h lobject.h llimits.h lstate.h \
-  ltm.h lzio.h lmem.h lstring.h lgc.h lvm.h
-lopcodes.o: lopcodes.c lopcodes.h llimits.h lua.h luaconf.h
-loslib.o: loslib.c lua.h luaconf.h lauxlib.h lualib.h
-lparser.o: lparser.c lua.h luaconf.h lcode.h llex.h lobject.h llimits.h \
-  lzio.h lmem.h lopcodes.h lparser.h ldebug.h lstate.h ltm.h ldo.h \
-  lfunc.h lstring.h lgc.h ltable.h
-lstate.o: lstate.c lua.h luaconf.h ldebug.h lstate.h lobject.h llimits.h \
-  ltm.h lzio.h lmem.h ldo.h lfunc.h lgc.h llex.h lstring.h ltable.h
-lstring.o: lstring.c lua.h luaconf.h lmem.h llimits.h lobject.h lstate.h \
-  ltm.h lzio.h lstring.h lgc.h
-lstrlib.o: lstrlib.c lua.h luaconf.h lauxlib.h lualib.h
-ltable.o: ltable.c lua.h luaconf.h ldebug.h lstate.h lobject.h llimits.h \
-  ltm.h lzio.h lmem.h ldo.h lgc.h ltable.h
-ltablib.o: ltablib.c lua.h luaconf.h lauxlib.h lualib.h
-ltm.o: ltm.c lua.h luaconf.h lobject.h llimits.h lstate.h ltm.h lzio.h \
-  lmem.h lstring.h lgc.h ltable.h
-lua.o: lua.c lua.h luaconf.h lauxlib.h lualib.h
-luac.o: luac.c lua.h luaconf.h lauxlib.h ldo.h lobject.h llimits.h \
-  lstate.h ltm.h lzio.h lmem.h lfunc.h lopcodes.h lstring.h lgc.h \
-  lundump.h
-lundump.o: lundump.c lua.h luaconf.h ldebug.h lstate.h lobject.h \
-  llimits.h ltm.h lzio.h lmem.h ldo.h lfunc.h lstring.h lgc.h lundump.h
-lvm.o: lvm.c lua.h luaconf.h ldebug.h lstate.h lobject.h llimits.h ltm.h \
-  lzio.h lmem.h ldo.h lfunc.h lgc.h lopcodes.h lstring.h ltable.h lvm.h
-lzio.o: lzio.c lua.h luaconf.h llimits.h lmem.h lstate.h lobject.h ltm.h \
-  lzio.h
-print.o: print.c ldebug.h lstate.h lua.h luaconf.h lobject.h llimits.h \
-  ltm.h lzio.h lmem.h lopcodes.h lundump.h
-
-# (end of Makefile)

Added: trunk/src/lua/Makefile.am
URL: 
http://svn.gna.org/viewcvs/wesnoth/trunk/src/lua/Makefile.am?rev=44998&view=auto
==============================================================================
--- trunk/src/lua/Makefile.am (added)
+++ trunk/src/lua/Makefile.am Sat Jul 31 14:50:25 2010
@@ -1,0 +1,34 @@
+CC=$(CXX)
+
+noinst_LIBRARIES = liblua.a
+
+liblua_a_SOURCES = \
+       lapi.c \
+       lauxlib.c \
+       lbaselib.c \
+       lcode.c \
+       ldblib.c \
+       ldebug.c \
+       ldo.c \
+       ldump.c \
+       lfunc.c \
+       lgc.c \
+       linit.c \
+       liolib.c \
+       llex.c \
+       lmathlib.c \
+       lmem.c \
+       loadlib.c \
+       lobject.c \
+       lopcodes.c \
+       loslib.c \
+       lparser.c \
+       lstate.c \
+       lstring.c \
+       lstrlib.c \
+       ltable.c \
+       ltablib.c \
+       ltm.c \
+       lundump.c \
+       lvm.c \
+       lzio.c




Related Messages


Powered by MHonArc, Updated Sat Jul 31 16:00:15 2010