浏览代码

build: add a common.am include file and a "make lolcheck" target that does

nothing for now except ensure that every makefile includes common.am.
legacy
Sam Hocevar sam 13 年前
父节点
当前提交
e390f03e0a
共有 12 个文件被更改,包括 43 次插入4 次删除
  1. +3
    -3
      Makefile.am
  2. +5
    -1
      build/Makefile.am
  3. +17
    -0
      build/autotools/common.am
  4. +2
    -0
      src/Makefile.am
  5. +2
    -0
      src/data/Makefile.am
  6. +2
    -0
      src/data/font/Makefile.am
  7. +2
    -0
      test/Makefile.am
  8. +2
    -0
      test/math/Makefile.am
  9. +2
    -0
      test/sandbox/Makefile.am
  10. +2
    -0
      test/xolotl/Makefile.am
  11. +2
    -0
      tools/Makefile.am
  12. +2
    -0
      tutorial/Makefile.am

+ 3
- 3
Makefile.am 查看文件

@@ -1,4 +1,6 @@


include $(top_srcdir)/build/autotools/common.am

# Put "people" at the end because they're more likely to break builds. # Put "people" at the end because they're more likely to break builds.
SUBDIRS = build src tutorial test tools games people SUBDIRS = build src tutorial test tools games people
DIST_SUBDIRS = $(SUBDIRS) binaries DIST_SUBDIRS = $(SUBDIRS) binaries
@@ -6,9 +8,7 @@ DIST_SUBDIRS = $(SUBDIRS) binaries
EXTRA_DIST = bootstrap TODO EXTRA_DIST = bootstrap TODO
AUTOMAKE_OPTIONS = dist-bzip2 AUTOMAKE_OPTIONS = dist-bzip2


bench:
cd test && $(MAKE) $(AM_MAKEFLAGS) $@
.PHONY: bench
check: lolcheck


dist: lolunit-$(LOLUNIT_VERSION).tar.gz dist: lolunit-$(LOLUNIT_VERSION).tar.gz
dist: lolremez-$(LOLREMEZ_VERSION).tar.gz dist: lolremez-$(LOLREMEZ_VERSION).tar.gz


+ 5
- 1
build/Makefile.am 查看文件

@@ -1,8 +1,12 @@


include $(top_srcdir)/build/autotools/common.am

EXTRA_DIST = lol-build \ EXTRA_DIST = lol-build \
check-source.sh \ check-source.sh \
build-linux build-mingw build-mingw64 build-ps3 \ build-linux build-mingw build-mingw64 build-ps3 \
build-nacl32 build-nacl64
build-nacl32 build-nacl64 \
\
autotools/common.am


TESTS = check-source.sh TESTS = check-source.sh



+ 17
- 0
build/autotools/common.am 查看文件

@@ -0,0 +1,17 @@

bench: bench-recursive
bench-recursive:
@if test -n "$(SUBDIRS)"; then for subdir in $(SUBDIRS); do \
($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) bench) || exit 1; \
done; \
fi

lolcheck: lolcheck-recursive
lolcheck-recursive:
@if test -n "$(SUBDIRS)"; then for subdir in $(SUBDIRS); do \
($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) lolcheck) || exit 1; \
done; \
fi

.PHONY: lolcheck bench


+ 2
- 0
src/Makefile.am 查看文件

@@ -1,4 +1,6 @@


include $(top_srcdir)/build/autotools/common.am

SUBDIRS = data SUBDIRS = data


noinst_LIBRARIES = liblol.a noinst_LIBRARIES = liblol.a


+ 2
- 0
src/data/Makefile.am 查看文件

@@ -1,3 +1,5 @@


include $(top_srcdir)/build/autotools/common.am

SUBDIRS = font SUBDIRS = font



+ 2
- 0
src/data/font/Makefile.am 查看文件

@@ -1,4 +1,6 @@


include $(top_srcdir)/build/autotools/common.am

if USE_CACA if USE_CACA
all: ascii.png all: ascii.png




+ 2
- 0
test/Makefile.am 查看文件

@@ -1,4 +1,6 @@


include $(top_srcdir)/build/autotools/common.am

SUBDIRS = math sandbox xolotl SUBDIRS = math sandbox xolotl


AM_CPPFLAGS = -I$(top_srcdir)/src AM_CPPFLAGS = -I$(top_srcdir)/src


+ 2
- 0
test/math/Makefile.am 查看文件

@@ -1,4 +1,6 @@


include $(top_srcdir)/build/autotools/common.am

AM_CPPFLAGS = -I$(top_srcdir)/src AM_CPPFLAGS = -I$(top_srcdir)/src


all-local: $(PROGRAMS) $(noinst_PROGRAMS) all-local: $(PROGRAMS) $(noinst_PROGRAMS)


+ 2
- 0
test/sandbox/Makefile.am 查看文件

@@ -1,4 +1,6 @@


include $(top_srcdir)/build/autotools/common.am

AM_CPPFLAGS = -I$(top_srcdir)/src AM_CPPFLAGS = -I$(top_srcdir)/src


all-local: $(noinst_PROGRAMS) all-local: $(noinst_PROGRAMS)


+ 2
- 0
test/xolotl/Makefile.am 查看文件

@@ -1,4 +1,6 @@


include $(top_srcdir)/build/autotools/common.am

AM_CPPFLAGS = -I$(top_srcdir)/src AM_CPPFLAGS = -I$(top_srcdir)/src


all-local: $(noinst_PROGRAMS) all-local: $(noinst_PROGRAMS)


+ 2
- 0
tools/Makefile.am 查看文件

@@ -1,4 +1,6 @@


include $(top_srcdir)/build/autotools/common.am

SUBDIRS = SUBDIRS =
SUBDIRS += neercs SUBDIRS += neercs




+ 2
- 0
tutorial/Makefile.am 查看文件

@@ -1,4 +1,6 @@


include $(top_srcdir)/build/autotools/common.am

AM_CPPFLAGS = -I$(top_srcdir)/src AM_CPPFLAGS = -I$(top_srcdir)/src


all-local: $(PROGRAMS) $(noinst_PROGRAMS) all-local: $(PROGRAMS) $(noinst_PROGRAMS)


正在加载...
取消
保存