diff options
| author | Ben Longbons <b.r.longbons@gmail.com> | 2013-09-26 08:06:31 -0700 |
|---|---|---|
| committer | Ben Longbons <b.r.longbons@gmail.com> | 2013-09-26 08:06:31 -0700 |
| commit | c600517ac38ee9b6ab47b45ab3ab61d69dd56886 (patch) | |
| tree | 6db0501b8709faf9bc517e396580c283833bd358 | |
| parent | a15876e7bff0a45b280f177173446a7a5e9f6cdc (diff) | |
| download | tmwa-c600517ac38ee9b6ab47b45ab3ab61d69dd56886.tar.gz tmwa-c600517ac38ee9b6ab47b45ab3ab61d69dd56886.tar.bz2 tmwa-c600517ac38ee9b6ab47b45ab3ab61d69dd56886.tar.xz tmwa-c600517ac38ee9b6ab47b45ab3ab61d69dd56886.zip | |
Use the new template mechanism for attoconf
| -rw-r--r-- | Makefile.in | 48 | ||||
| -rwxr-xr-x | configure | 14 | ||||
| m--------- | deps/attoconf | 0 |
3 files changed, 57 insertions, 5 deletions
diff --git a/Makefile.in b/Makefile.in index 01592ac..3f6ba3f 100644 --- a/Makefile.in +++ b/Makefile.in @@ -1,3 +1,51 @@ +SRC_DIR = @SRC_DIR@ +CONFIG_HASH = @CONFIG_HASH@ + +PACKAGE = @PACKAGE@ +PACKAGE_NAME = @PACKAGE_NAME@ + +PREFIX = @PREFIX@ +EPREFIX = @EPREFIX@ + +BINDIR = @BINDIR@ +SBINDIR = @SBINDIR@ +LIBEXECDIR = @LIBEXECDIR@ +SYSCONFDIR = @SYSCONFDIR@ +SHAREDSTATEDIR = @SHAREDSTATEDIR@ +LOCALSTATEDIR = @LOCALSTATEDIR@ +LIBDIR = @LIBDIR@ +INCLUDEDIR = @INCLUDEDIR@ +OLDINCLUDEDIR = @OLDINCLUDEDIR@ +DATAROOTDIR = @DATAROOTDIR@ +DATADIR = @DATADIR@ +PACKAGEDATADIR = @PACKAGEDATADIR@ +INFODIR = @INFODIR@ +LOCALEDIR = @LOCALEDIR@ +MANDIR = @MANDIR@ +DOCDIR = @DOCDIR@ +HTMLDIR = @HTMLDIR@ +DVIDIR = @DVIDIR@ +PDFDIR = @PDFDIR@ +PSDIR = @PSDIR@ + + +BISON = @BISON@ +FLEX = @FLEX@ +CPPFLAGS = @CPPFLAGS@ +LDFLAGS = @LDFLAGS@ +LDLIBS = @LDLIBS@ +CXX = @CXX@ +CXXFLAGS = @CXXFLAGS@ +GTEST_DIR = @GTEST_DIR@ + +ENABLE_BACKUPS_DURING_INSTALL = @ENABLE_BACKUPS_DURING_INSTALL@ +ENABLE_WARNINGS = @ENABLE_WARNINGS@ +ENABLE_ABI6 = @ENABLE_ABI6@ +ENABLE_CYGWIN_HACKS = @ENABLE_CYGWIN_HACKS@ +ENABLE_COMPAT_SYMLINKS = @ENABLE_COMPAT_SYMLINKS@ + + + # This file is reverse included. Don't forward in that case. ifeq '${MAKEFILE_LIST}' ' Makefile' .DEFAULT_GOAL=.default-target-wrapper @@ -27,7 +27,7 @@ try: except ImportError: sys.exit('attoconf missing - please run: git submodule update --init') else: - require_version(0, 6) + require_version(0, 8) from attoconf.classy import add_slots from attoconf.lib.c import Cxx @@ -35,14 +35,14 @@ from attoconf.lib.lex import Flex from attoconf.lib.yacc import Bison from attoconf.lib.install import Install from attoconf.lib.config_hash import ConfigHash -from attoconf.lib.make import Make +from attoconf.lib.templates import Templates from attoconf.types import enum, filepath yesno = enum('yes', 'no') @add_slots -class Configuration(Cxx, Flex, Bison, Install, ConfigHash, Make): +class Configuration(Cxx, Flex, Bison, Install, ConfigHash, Templates): def general(self): super(Configuration, self).general() home = os.path.expanduser('~') @@ -91,8 +91,12 @@ class Configuration(Cxx, Flex, Bison, Install, ConfigHash, Make): def main(): srcdir = os.path.dirname(sys.argv[0]) - proj = Configuration(srcdir) - proj.set_package('tmwa', 'The Mana World (Athena server)') + proj = Configuration( + srcdir=srcdir, + package='tmwa', + package_name='The Mana World (Athena server)', + template_files=['Makefile'], + ) proj.jiggle() build = proj.build('.') build.configure(sys.argv[1:], os.environ) diff --git a/deps/attoconf b/deps/attoconf -Subproject dea8d4eb080d8f04ecd74a29994c5745b6fa146 +Subproject 860ad99d5ac781d1277c0c4e90735e5e3dadd4d |