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

diff --git a/.cvsignore b/.cvsignore
index c96441d142120f141bea88586bf26a629fb6a3eb..42c355868b204a8c2c9d3c233f8de2687a02643a 100644 (file)
--- 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 e16e21d379bf652445e70ce9fc3a766a7fc21369..6a71e01f973888c75f8727fc9282d59011a03788 100644 (file)
--- 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 65f0cc30cf67bc6f96345894a900f5d81e766466..767a21592888530a5d3cd17b4714fb66a2b1cbe4 100644 (file)
--- 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 15cf55fd3fd0dd96ed726fab319a086d59068b9e..8608533d53b81e161033f9ad0099efa3ae565a0a 100644 (file)
--- 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 65f0cc30cf67bc6f96345894a900f5d81e766466..767a21592888530a5d3cd17b4714fb66a2b1cbe4 100644 (file)
--- 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 65f0cc30cf67bc6f96345894a900f5d81e766466..767a21592888530a5d3cd17b4714fb66a2b1cbe4 100644 (file)
--- 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 65f0cc30cf67bc6f96345894a900f5d81e766466..767a21592888530a5d3cd17b4714fb66a2b1cbe4 100644 (file)
--- 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 65f0cc30cf67bc6f96345894a900f5d81e766466..767a21592888530a5d3cd17b4714fb66a2b1cbe4 100644 (file)
--- 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 65f0cc30cf67bc6f96345894a900f5d81e766466..767a21592888530a5d3cd17b4714fb66a2b1cbe4 100644 (file)
--- a/modules/metadata/.cvsignore
+++ b/modules/metadata/.cvsignore
@@ -6,5 +6,6 @@ Makefile
 *.lo
 *.slo
 *.so
+*.x
 Debug
 Release