From e438240ed5627b8772ee9dad84b66d5be7d6694a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Stefan=20B=C3=BChler?= Date: Sun, 2 Aug 2009 12:02:36 +0200 Subject: [PATCH] automake: fix make dist and module "lib" prefix --- Makefile.am | 2 +- src/Makefile.am | 2 + src/main/Makefile.am | 5 ++ src/modules/Makefile.am | 115 ++++++++++++++++++++++------------------ 4 files changed, 72 insertions(+), 52 deletions(-) diff --git a/Makefile.am b/Makefile.am index 2f41259..ba06ae0 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,4 +1,4 @@ SUBDIRS=src ACLOCAL_AMFLAGS=-I m4 -EXTRA_DIST=autogen.sh CMakeLists.txt +EXTRA_DIST=autogen.sh CMakeLists.txt include diff --git a/src/Makefile.am b/src/Makefile.am index 630edf8..30b6584 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1,2 +1,4 @@ SUBDIRS=common main modules angel + +EXTRA_DIST=CMakeLists.txt config.h.cmake diff --git a/src/main/Makefile.am b/src/main/Makefile.am index f3cdd23..e8672e4 100644 --- a/src/main/Makefile.am +++ b/src/main/Makefile.am @@ -45,6 +45,11 @@ lighttpd_shared_src+= \ config_lua.c \ value_lua.c endif +EXTRA_lighttpd_SOURCES=\ + actions_lua.c \ + condition_lua.c \ + config_lua.c \ + value_lua.c BUILT_SOURCES=config_parser.c http_request_parser.c http_response_parser.c url_parser.c diff --git a/src/modules/Makefile.am b/src/modules/Makefile.am index ddbebf8..6cbcf37 100644 --- a/src/modules/Makefile.am +++ b/src/modules/Makefile.am @@ -7,56 +7,69 @@ common_ldflags = -module -export-dynamic -avoid-version -no-undefined $(common_l AM_CPPFLAGS = $(common_cflags) -install_libs += mod_access.la -mod_access_la_SOURCES = mod_access.c -mod_access_la_LDFLAGS = -module -export-dynamic -avoid-version -no-undefined - -install_libs += mod_accesslog.la -mod_accesslog_la_SOURCES = mod_accesslog.c -mod_accesslog_la_LDFLAGS = -module -export-dynamic -avoid-version -no-undefined - -install_libs += mod_balancer.la -mod_balancer_la_SOURCES = mod_balancer.c -mod_balancer_la_LDFLAGS = -module -export-dynamic -avoid-version -no-undefined - -install_libs += mod_cache_disk_etag.la -mod_cache_disk_etag_la_SOURCES = mod_cache_disk_etag.c -mod_cache_disk_etag_la_LDFLAGS = -module -export-dynamic -avoid-version -no-undefined - -install_libs += mod_debug.la -mod_debug_la_SOURCES = mod_debug.c -mod_debug_la_LDFLAGS = -module -export-dynamic -avoid-version -no-undefined - -install_libs += mod_dirlist.la -mod_dirlist_la_SOURCES = mod_dirlist.c -mod_dirlist_la_LDFLAGS = -module -export-dynamic -avoid-version -no-undefined - -install_libs += mod_expire.la -mod_expire_la_SOURCES = mod_expire.c -mod_expire_la_LDFLAGS = -module -export-dynamic -avoid-version -no-undefined - -install_libs += mod_fastcgi.la -mod_fastcgi_la_SOURCES = mod_fastcgi.c -mod_fastcgi_la_LDFLAGS = -module -export-dynamic -avoid-version -no-undefined - -install_libs += mod_fortune.la -mod_fortune_la_SOURCES = mod_fortune.c -mod_fortune_la_LDFLAGS = -module -export-dynamic -avoid-version -no-undefined - -install_libs += mod_redirect.la -mod_redirect_la_SOURCES = mod_redirect.c -mod_redirect_la_LDFLAGS = -module -export-dynamic -avoid-version -no-undefined - -install_libs += mod_rewrite.la -mod_rewrite_la_SOURCES = mod_rewrite.c -mod_rewrite_la_LDFLAGS = -module -export-dynamic -avoid-version -no-undefined - -install_libs += mod_status.la -mod_status_la_SOURCES = mod_status.c -mod_status_la_LDFLAGS = -module -export-dynamic -avoid-version -no-undefined - -install_libs += mod_vhost.la -mod_vhost_la_SOURCES = mod_vhost.c -mod_vhost_la_LDFLAGS = -module -export-dynamic -avoid-version -no-undefined +install_libs += libmod_access.la +libmod_access_la_SOURCES = mod_access.c +libmod_access_la_LDFLAGS = $(common_ldflags) +# libmod_access_la_LIBADD = $(common_libadd) + +install_libs += libmod_accesslog.la +libmod_accesslog_la_SOURCES = mod_accesslog.c +libmod_accesslog_la_LDFLAGS = $(common_ldflags) +# libmod_accesslog_la_LIBADD = $(common_libadd) + +install_libs += libmod_balancer.la +libmod_balancer_la_SOURCES = mod_balancer.c +libmod_balancer_la_LDFLAGS = $(common_ldflags) +# libmod_balancer_la_LIBADD = $(common_libadd) + +install_libs += libmod_cache_disk_etag.la +libmod_cache_disk_etag_la_SOURCES = mod_cache_disk_etag.c +libmod_cache_disk_etag_la_LDFLAGS = $(common_ldflags) +# libmod_cache_disk_etag_la_LIBADD = $(common_libadd) + +install_libs += libmod_debug.la +libmod_debug_la_SOURCES = mod_debug.c +libmod_debug_la_LDFLAGS = $(common_ldflags) +# libmod_debug_la_LIBADD = $(common_libadd) + +install_libs += libmod_dirlist.la +libmod_dirlist_la_SOURCES = mod_dirlist.c +libmod_dirlist_la_LDFLAGS = $(common_ldflags) +# libmod_dirlist_la_LIBADD = $(common_libadd) + +install_libs += libmod_expire.la +libmod_expire_la_SOURCES = mod_expire.c +libmod_expire_la_LDFLAGS = $(common_ldflags) +# libmod_expire_la_LIBADD = $(common_libadd) + +install_libs += libmod_fastcgi.la +libmod_fastcgi_la_SOURCES = mod_fastcgi.c +libmod_fastcgi_la_LDFLAGS = $(common_ldflags) +# libmod_fastcgi_la_LIBADD = $(common_libadd) + +install_libs += libmod_fortune.la +libmod_fortune_la_SOURCES = mod_fortune.c +libmod_fortune_la_LDFLAGS = $(common_ldflags) +# libmod_fortune_la_LIBADD = $(common_libadd) + +install_libs += libmod_redirect.la +libmod_redirect_la_SOURCES = mod_redirect.c +libmod_redirect_la_LDFLAGS = $(common_ldflags) +# libmod_redirect_la_LIBADD = $(common_libadd) + +install_libs += libmod_rewrite.la +libmod_rewrite_la_SOURCES = mod_rewrite.c +libmod_rewrite_la_LDFLAGS = $(common_ldflags) +# libmod_rewrite_la_LIBADD = $(common_libadd) + +install_libs += libmod_status.la +libmod_status_la_SOURCES = mod_status.c +libmod_status_la_LDFLAGS = $(common_ldflags) +# libmod_status_la_LIBADD = $(common_libadd) + +install_libs += libmod_vhost.la +libmod_vhost_la_SOURCES = mod_vhost.c +libmod_vhost_la_LDFLAGS = $(common_ldflags) +# libmod_vhost_la_LIBADD = $(common_libadd) pkglib_LTLIBRARIES=$(install_libs)