building separate lib and static linking it into mod_md

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/trunk-md@1804402 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/modules/md/Makefile b/modules/md/Makefile
new file mode 100644 (file)
index 0000000..2390c21
--- /dev/null
+++ b/modules/md/Makefile
@@ -0,0 +1,51 @@
+top_srcdir   = /Users/sei/projects/httpd/trunk-md
+top_builddir = /Users/sei/projects/httpd/trunk-md
+srcdir       = /Users/sei/projects/httpd/trunk-md/modules/md
+builddir     = /Users/sei/projects/httpd/trunk-md/modules/md
+VPATH        = /Users/sei/projects/httpd/trunk-md/modules/md
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License.  You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+#
+#   standard stuff
+#
+
+
+LTLIBRARY_NAME    = libmd.la
+LTLIBRARY_SOURCES = \
+       md_acme.c \
+       md_acme_acct.c \
+       md_acme_authz.c \
+       md_acme_drive.c \
+       md_core.c \
+       md_curl.c \
+       md_crypt.c \
+       md_http.c \
+       md_json.c \
+       md_jws.c \
+       md_log.c \
+       md_reg.c \
+       md_store.c \
+       md_store_fs.c \
+       md_util.c
+
+
+LTLIBRARY_DEPENDENCIES = md.h
+
+local-shared-build: $(LTLIBRARY_NAME) $(SHARED_TARGETS)
+
+
+include $(top_srcdir)/build/library.mk
+include $(top_srcdir)/build/special.mk

diff --git a/modules/md/Makefile.in b/modules/md/Makefile.in
index 4395bc3ac765b000d238b9e92c9b8eb104b5ee65..5f752cab22ccc65dcd05f5a25ada50cc17a03b56 100644 (file)
--- a/modules/md/Makefile.in
+++ b/modules/md/Makefile.in
@@ -17,4 +17,30 @@
 #   standard stuff
 #
 
+
+LTLIBRARY_NAME    = libmd.la
+LTLIBRARY_SOURCES = \
+       md_acme.c \
+       md_acme_acct.c \
+       md_acme_authz.c \
+       md_acme_drive.c \
+       md_core.c \
+       md_curl.c \
+       md_crypt.c \
+       md_http.c \
+       md_json.c \
+       md_jws.c \
+       md_log.c \
+       md_reg.c \
+       md_store.c \
+       md_store_fs.c \
+       md_util.c
+
+
+LTLIBRARY_DEPENDENCIES = md.h
+
+local-shared-build: $(LTLIBRARY_NAME) $(SHARED_TARGETS)
+
+
+include $(top_srcdir)/build/library.mk
 include $(top_srcdir)/build/special.mk

diff --git a/modules/md/config2.m4 b/modules/md/config2.m4
index 62b809fd6ec4cbcdfbd374ce2b630f5178fe1554..820d7cb8c43b3daefe43cd435339c2cac149457e 100644 (file)
--- a/modules/md/config2.m4
+++ b/modules/md/config2.m4
@@ -246,25 +246,9 @@ dnl #  list of module object files
 md_objs="dnl
 mod_md.lo dnl
 md_config.lo dnl
-md_core.lo dnl
-md_crypt.lo dnl
-md_curl.lo dnl
-md_http.lo dnl
-md_json.lo dnl
-md_jws.lo dnl
-md_log.lo dnl
 md_os.lo dnl
-md_reg.lo dnl
-md_store.lo dnl
-md_store_fs.lo dnl
-md_util.lo dnl
-md_acme.lo dnl
-md_acme_acct.lo dnl
-md_acme_authz.lo dnl
-md_acme_drive.lo dnl
 "
 
-
 dnl # hook module into the Autoconf mechanism (--enable-md)
 APACHE_MODULE(md, [Managed Domain handling], $md_objs, , most, [
     APACHE_CHECK_OPENSSL
@@ -284,6 +268,8 @@ APACHE_MODULE(md, [Managed Domain handling], $md_objs, , most, [
         AC_MSG_WARN([libcurl not found])
         enable_md=no
     fi
+    
+    APR_ADDTO(MOD_MD_LDADD, [ "libmd.la" ])
 ])
 
 # Ensure that other modules can pick up mod_md.h