From 62ade4110272a9bca78525597e9fff52a5ea2474 Mon Sep 17 00:00:00 2001 From: Jeff Trawick Date: Tue, 15 May 2001 17:30:44 +0000 Subject: [PATCH] clean up DSO builds on OS/390 a bit by ignoring some generated files and by passing libtool the OS/390-specific options needed to split the main httpd executable into a small executable with main() and a dll with everything else (previously this information was hard-coded in the OS/390 libtool program) git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89124 13f79535-47bb-0310-9956-ffa450edef68 --- .cvsignore | 2 ++ configure.in | 4 ++-- modules/aaa/.cvsignore | 1 + modules/experimental/.cvsignore | 1 + modules/filters/.cvsignore | 1 + modules/generators/.cvsignore | 1 + modules/loggers/.cvsignore | 1 + modules/mappers/.cvsignore | 1 + modules/metadata/.cvsignore | 1 + 9 files changed, 11 insertions(+), 2 deletions(-) diff --git a/.cvsignore b/.cvsignore index c96441d142..42c355868b 100644 --- a/.cvsignore +++ b/.cvsignore @@ -25,3 +25,5 @@ LibR Apache.ncb Apache.opt InstallBin.plg +apachecore.dll +*.x diff --git a/configure.in b/configure.in index e16e21d379..6a71e01f97 100644 --- a/configure.in +++ b/configure.in @@ -243,8 +243,8 @@ if test "$apache_need_shared" = "yes"; then POST_SHARED_CMDS='rm $(top_builddir)/_APP_' ;; *os390) - APR_ADDTO(CFLAGS, [-Wc,DLL,EXPORTALL]) - ;; + HTTPD_LDFLAGS="$HTTPD_LDFLAGS --main=$abs_srcdir/server/main.o --core-dll=$abs_srcdir/apachecore.dll" + SH_LDFLAGS="$SH_LDFLAGS --core-dll=$abs_srcdir/apachecore.dll" esac shared_build="shared-modules" fi diff --git a/modules/aaa/.cvsignore b/modules/aaa/.cvsignore index 65f0cc30cf..767a215928 100644 --- a/modules/aaa/.cvsignore +++ b/modules/aaa/.cvsignore @@ -6,5 +6,6 @@ Makefile *.lo *.slo *.so +*.x Debug Release diff --git a/modules/experimental/.cvsignore b/modules/experimental/.cvsignore index 15cf55fd3f..8608533d53 100644 --- a/modules/experimental/.cvsignore +++ b/modules/experimental/.cvsignore @@ -6,6 +6,7 @@ Makefile *.lo *.slo *.so +*.x Debug Release *.plg diff --git a/modules/filters/.cvsignore b/modules/filters/.cvsignore index 65f0cc30cf..767a215928 100644 --- a/modules/filters/.cvsignore +++ b/modules/filters/.cvsignore @@ -6,5 +6,6 @@ Makefile *.lo *.slo *.so +*.x Debug Release diff --git a/modules/generators/.cvsignore b/modules/generators/.cvsignore index 65f0cc30cf..767a215928 100644 --- a/modules/generators/.cvsignore +++ b/modules/generators/.cvsignore @@ -6,5 +6,6 @@ Makefile *.lo *.slo *.so +*.x Debug Release diff --git a/modules/loggers/.cvsignore b/modules/loggers/.cvsignore index 65f0cc30cf..767a215928 100644 --- a/modules/loggers/.cvsignore +++ b/modules/loggers/.cvsignore @@ -6,5 +6,6 @@ Makefile *.lo *.slo *.so +*.x Debug Release diff --git a/modules/mappers/.cvsignore b/modules/mappers/.cvsignore index 65f0cc30cf..767a215928 100644 --- a/modules/mappers/.cvsignore +++ b/modules/mappers/.cvsignore @@ -6,5 +6,6 @@ Makefile *.lo *.slo *.so +*.x Debug Release diff --git a/modules/metadata/.cvsignore b/modules/metadata/.cvsignore index 65f0cc30cf..767a215928 100644 --- a/modules/metadata/.cvsignore +++ b/modules/metadata/.cvsignore @@ -6,5 +6,6 @@ Makefile *.lo *.slo *.so +*.x Debug Release -- 2.50.1