Browse Source

Fix buildsystems

personal/stbuehler/wip
Stefan Bühler 12 years ago
parent
commit
63eadd22fa
  1. 6
      Makefile.am
  2. 13
      configure.ac
  3. 2
      src/CMakeLists.txt
  4. 2
      src/Makefile.am
  5. 12
      src/angel/Makefile.am
  6. 2
      src/common/Makefile.am
  7. 12
      src/main/Makefile.am
  8. 2
      src/modules/Makefile.am

6
Makefile.am

@ -1,4 +1,6 @@
SUBDIRS=src
SUBDIRS=src include
ACLOCAL_AMFLAGS=-I m4
EXTRA_DIST=autogen.sh CMakeLists.txt include
EXTRA_DIST=autogen.sh CMakeLists.txt
DISTCHECK_CONFIGURE_FLAGS=--with-lua --with-openssl --with-kerberos5 --with-zlib --with-bzip2

13
configure.ac

@ -7,7 +7,7 @@ AC_CONFIG_SRCDIR([src/main/lighttpd.c])
AC_CONFIG_HEADER([include/lighttpd/config.h])
AC_CONFIG_MACRO_DIR([m4])
AM_INIT_AUTOMAKE([-Wall -Werror foreign])
AM_INIT_AUTOMAKE([-Wall -Wportability -Wno-override -Werror foreign dist-bzip2 tar-ustar])
dnl check environment
AC_USE_SYSTEM_EXTENSIONS
@ -287,5 +287,14 @@ if test x$extrawarnings = xtrue; then
CFLAGS="${CFLAGS} -g -O2 -g2 -Wall -Wmissing-declarations -Wdeclaration-after-statement -Wno-pointer-sign -Wcast-align -Winline -Wsign-compare -Wnested-externs -Wpointer-arith -Wl,--as-needed -Wformat-security"
fi
AC_CONFIG_FILES([Makefile src/Makefile src/common/Makefile src/main/Makefile src/angel/Makefile src/modules/Makefile])
AC_CONFIG_FILES([Makefile \
include/Makefile \
include/lighttpd/Makefile \
src/Makefile \
src/common/Makefile \
src/main/Makefile \
src/angel/Makefile \
src/modules/Makefile \
src/unittests/Makefile \
])
AC_OUTPUT

2
src/CMakeLists.txt

@ -405,4 +405,4 @@ IF(BUILD_UNIT_TESTS)
ADD_TEST_BINARY(Chunk-UnitTest test-chunk unittests/test-chunk.c)
ADD_TEST_BINARY(RangeParser-UnitTest test-range-parser unittests/test-range-parser.c)
ENDIF(BUILD_UNIT_TESTS)
ENDIF(BUILD_UNIT_TESTS)

2
src/Makefile.am

@ -1,4 +1,4 @@
SUBDIRS=common main modules angel
SUBDIRS=common main modules angel unittests
EXTRA_DIST=CMakeLists.txt config.h.cmake

12
src/angel/Makefile.am

@ -1,5 +1,7 @@
bin_PROGRAMS=lighttpd-angel
lib_LTLIBRARIES=liblighttpd-sharedangel.la
common_cflags=-I$(top_srcdir)/include -I$(top_builddir)/include
lighttpd_angel_shared_src= \
@ -16,8 +18,14 @@ BUILT_SOURCES=angel_config_parser.c
angel_config_parser.c: angel_config_parser.rl
ragel -C -T1 -o $@ $<
lighttpd_angel_SOURCES=angel_main.c $(lighttpd_angel_shared_src)
EXTRA_DIST=angel_config_parser.rl
liblighttpd_sharedangel_la_SOURCES=$(lighttpd_angel_shared_src)
liblighttpd_sharedangel_la_CPPFLAGS=$(common_cflags) $(GTHREAD_CFLAGS) $(GMODULE_CFLAGS) $(LIBEV_CFLAGS) $(LUA_CFLAGS)
liblighttpd_sharedangel_la_LDFLAGS=-export-dynamic $(GTHREAD_LIBS) $(GMODULE_LIBS) $(LIBEV_LIBS)
lighttpd_angel_SOURCES=angel_main.c
lighttpd_angel_CPPFLAGS=$(common_cflags) $(GTHREAD_CFLAGS) $(GMODULE_CFLAGS) $(LIBEV_CFLAGS) $(LUA_CFLAGS) -DDEFAULT_LIBDIR='"$(pkglibdir)"'
lighttpd_angel_LDFLAGS=-export-dynamic $(GTHREAD_LIBS) $(GMODULE_LIBS) $(LIBEV_LIBS) $(LUA_LIBS)
lighttpd_angel_LDADD=../common/liblighttpd-common.la
lighttpd_angel_LDADD=../common/liblighttpd-common.la ../angel/liblighttpd-sharedangel.la

2
src/common/Makefile.am

@ -22,6 +22,8 @@ BUILT_SOURCES=ip_parsers.c
ip_parsers.c: ip_parsers.rl
ragel -C -T1 -o $@ $<
EXTRA_DIST=ip_parsers.rl
liblighttpd_common_la_SOURCES=$(common_src)
liblighttpd_common_la_CPPFLAGS=$(common_cflags) $(GTHREAD_CFLAGS) $(GMODULE_CFLAGS) $(LIBEV_CFLAGS)
liblighttpd_common_la_LDFLAGS=-export-dynamic $(GTHREAD_LIBS) $(GMODULE_LIBS) $(LIBEV_LIBS)

12
src/main/Makefile.am

@ -1,5 +1,7 @@
bin_PROGRAMS=lighttpd
lib_LTLIBRARIES=liblighttpd-shared.la
common_cflags=-I$(top_srcdir)/include -I$(top_builddir)/include
lighttpd_shared_src= \
@ -77,8 +79,14 @@ http_response_parser.c: http_response_parser.rl
url_parser.c: url_parser.rl
ragel -C -T1 -o $@ $<
lighttpd_SOURCES=lighttpd.c $(lighttpd_shared_src)
EXTRA_DIST=config_parser.rl http_range_parser.rl http_request_parser.rl http_response_parser.rl url_parser.rl
liblighttpd_shared_la_SOURCES=$(lighttpd_shared_src)
liblighttpd_shared_la_CPPFLAGS=$(common_cflags) $(GTHREAD_CFLAGS) $(GMODULE_CFLAGS) $(LIBEV_CFLAGS) $(LUA_CFLAGS)
liblighttpd_shared_la_LDFLAGS=-export-dynamic $(GTHREAD_LIBS) $(GMODULE_LIBS) $(LIBEV_LIBS)
lighttpd_SOURCES=lighttpd.c
lighttpd_CPPFLAGS=$(common_cflags) $(GTHREAD_CFLAGS) $(GMODULE_CFLAGS) $(LIBEV_CFLAGS) $(LUA_CFLAGS) -DDEFAULT_LIBDIR='"$(pkglibdir)"'
lighttpd_LDFLAGS=-export-dynamic $(GTHREAD_LIBS) $(GMODULE_LIBS) $(LIBEV_LIBS) $(LUA_LIBS)
lighttpd_LDADD=../common/liblighttpd-common.la
lighttpd_LDADD=../common/liblighttpd-common.la ../main/liblighttpd-shared.la

2
src/modules/Makefile.am

@ -4,7 +4,7 @@ common_cflags = -I$(top_srcdir)/include -I$(top_builddir)/include
common_cflags += $(GTHREAD_CFLAGS) $(GMODULE_CFLAGS) $(LIBEV_CFLAGS) $(LUA_CFLAGS) $(OPENSSL_CFLAGS)
common_libs = $(GTHREAD_LIBS) $(GMODULE_LIBS) $(LIBEV_LIBS) $(LUA_LIBS)
common_ldflags = -module -export-dynamic -avoid-version -no-undefined $(common_libs)
common_libadd = ../common/liblighttpd-common.la
common_libadd = ../common/liblighttpd-common.la ../main/liblighttpd-shared.la
AM_CPPFLAGS = $(common_cflags)

Loading…
Cancel
Save