diff options
| author | Glenn Strauss <gstrauss@gluelogic.com> | 2016-10-30 16:47:53 -0400 |
|---|---|---|
| committer | Glenn Strauss <gstrauss@gluelogic.com> | 2016-10-30 16:47:53 -0400 |
| commit | 3d04bc45f617f2f079d9572b6c9663e52424de29 (patch) | |
| tree | c3d11a26f309a1c9b90138e17816fa0118787ab6 | |
| parent | f59ff32fd9af633be3dabe280082a41ff99fd21b (diff) | |
| download | lighttpd-git-3d04bc45f617f2f079d9572b6c9663e52424de29.tar.gz | |
[build] move some build scripts to scripts/
| -rw-r--r-- | CMakeLists.txt | 2 | ||||
| -rw-r--r-- | Makefile.am | 4 | ||||
| -rw-r--r-- | configure.ac | 1 | ||||
| -rw-r--r-- | scripts/cmake/FindLibEV.cmake (renamed from cmake/FindLibEV.cmake) | 0 | ||||
| -rw-r--r-- | scripts/cmake/LighttpdMacros.cmake (renamed from cmake/LighttpdMacros.cmake) | 0 | ||||
| -rw-r--r-- | scripts/m4/ax_prog_cc_for_build.m4 (renamed from ax_prog_cc_for_build.m4) | 0 |
6 files changed, 3 insertions, 4 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index c1ff0c1e..ec307b02 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -2,7 +2,7 @@ project(lighttpd C) cmake_minimum_required(VERSION 2.8.2 FATAL_ERROR) -set(CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake) +set(CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/scripts/cmake) include(CTest) diff --git a/Makefile.am b/Makefile.am index 5453c847..481b808d 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,8 +1,8 @@ SUBDIRS=src doc tests -EXTRA_DIST=autogen.sh SConstruct CMakeLists.txt cmake README.FreeBSD +EXTRA_DIST=autogen.sh SConstruct CMakeLists.txt README.FreeBSD scripts -ACLOCAL_AMFLAGS = -I m4 +ACLOCAL_AMFLAGS = -I m4 -I scripts/m4 distcleancheck_listfiles = find -type f -exec sh -c 'test -f $(srcdir)/{} || echo {}' ';' diff --git a/configure.ac b/configure.ac index c3758bc6..cb10b245 100644 --- a/configure.ac +++ b/configure.ac @@ -5,7 +5,6 @@ AC_INIT([lighttpd], [1.4.43], [contact@lighttpd.net]) AC_CONFIG_SRCDIR([src/server.c]) AC_CONFIG_HEADER([config.h]) AC_CONFIG_MACRO_DIR([m4]) -m4_include(ax_prog_cc_for_build.m4) AC_CANONICAL_HOST diff --git a/cmake/FindLibEV.cmake b/scripts/cmake/FindLibEV.cmake index 739b4bad..739b4bad 100644 --- a/cmake/FindLibEV.cmake +++ b/scripts/cmake/FindLibEV.cmake diff --git a/cmake/LighttpdMacros.cmake b/scripts/cmake/LighttpdMacros.cmake index 95cab8d9..95cab8d9 100644 --- a/cmake/LighttpdMacros.cmake +++ b/scripts/cmake/LighttpdMacros.cmake diff --git a/ax_prog_cc_for_build.m4 b/scripts/m4/ax_prog_cc_for_build.m4 index 77fd346a..77fd346a 100644 --- a/ax_prog_cc_for_build.m4 +++ b/scripts/m4/ax_prog_cc_for_build.m4 |