Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Overall UNIX build system improvements:

* Makefile header is now completely dynamic
* Absolute paths everywhere
  (fixes Tru64 support)
* Get rid of LTLIBRARY_SHARED_NAME rule in library.mk
  (fixes Irix support, untested)
* VPATH does not contain variables anymore
  (fixes UnixWare support)
* Remove inclusion of program.mk in support/Makefile.in
  (PROGRAM_NAME is empty => breaks Irix and others)
* Call REENTRANCY_FLAGS earlier, so that flags are passed to header checks
  (might fix OpenBSD pthread.h-detection, untested)


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@85102 13f79535-47bb-0310-9956-ffa450edef68
  • Loading branch information...
commit e173491b48823b18ead094ad8ab8b59f52cb76e7 1 parent 37de80b
Sascha Schumann authored
View
5 Makefile.in
@@ -1,9 +1,4 @@
-DEPTH = .
-top_srcdir = @top_srcdir@
-srcdir = @srcdir@
-VPATH = @srcdir@
-
SUBDIRS = ap lib main modules os support $(REGEX_DIR)
PROGRAM_NAME = $(progname)
View
27 build/fastgen.sh
@@ -58,25 +58,30 @@
srcdir=$1
shift
-top_srcdir=`(cd $srcdir; pwd)`
-
mkdir_p=$1
shift
+top_srcdir=`(cd $srcdir; pwd)`
+top_builddir=`pwd`
+
if test "$mkdir_p" = "yes"; then
mkdir_p="mkdir -p"
else
mkdir_p="$top_srcdir/helpers/mkdir.sh"
fi
-base="\$(DEPTH)/$srcdir"
+for makefile in $@; do
+ echo "creating $makefile"
+# portable dirname
+ dir=`echo $makefile|sed 's%[^/][^/]*$%%'`
+
+ (cat <<EOF
+top_srcdir = $top_srcdir
+top_builddir = $top_builddir
+srcdir = $top_srcdir/$dir
+builddir = $top_builddir/$dir
+VPATH = $top_srcdir/$dir
+EOF
+)| cat - $makefile.in > $makefile
-for i in $@ ; do
- echo "creating $i"
- dir=`dirname $i`
- $mkdir_p $dir
- sed \
- -e s#@top_srcdir@#$base# \
- -e s#@srcdir@#$base/$dir# \
- < $top_srcdir/$i.in > $i
done
View
12 build/library.mk
@@ -58,15 +58,3 @@ LTLIBRARY_OBJECTS = $(LTLIBRARY_SOURCES:.c=.lo)
$(LTLIBRARY_NAME): $(LTLIBRARY_OBJECTS) $(LTLIBRARY_DEPENDENCIES)
$(LINK) $(LTLIBRARY_LDFLAGS) $(LTLIBRARY_OBJECTS) $(LTLIBRARY_LIBADD)
-
-$(LTLIBRARY_SHARED_NAME): $(LTLIBRARY_OBJECTS) $(LTLIBRARY_DEPENDENCIES)
- @test -d $(phplibdir) || $(mkinstalldirs) $(phplibdir)
- $(LINK) -avoid-version -module -rpath $(phplibdir) $(LTLIBRARY_LDFLAGS) $(LTLIBRARY_OBJECTS) $(LTLIBRARY_SHARED_LIBADD)
- $(SHLIBTOOL) --mode=install install $@ $(phplibdir)
-
-shared:
- @if test '$(SHLIBTOOL)' != '$(LIBTOOL)'; then \
- $(MAKE) 'LIBTOOL=$(SHLIBTOOL)' $(LTLIBRARY_SHARED_NAME); \
- else \
- $(MAKE) $(LTLIBRARY_SHARED_NAME); \
- fi;
View
8 build/rules.mk
@@ -54,7 +54,7 @@
# The build environment was provided by Sascha Schumann.
#
-include $(DEPTH)/config_vars.mk
+include $(top_builddir)/config_vars.mk
SHLIB_SUFFIX = so
@@ -66,14 +66,12 @@ mkinstalldirs = $(abs_srcdir)/helpers/mkdir.sh
INSTALL = $(abs_srcdir)/helpers/install.sh -c
INSTALL_DATA = $(INSTALL) -m 644
INSTALL_PROGRAM = $(INSTALL) -m 755
-SHLIBTOOL = $(SHELL) $(DEPTH)/shlibtool --silent
+SHLIBTOOL = $(SHELL) $(top_builddir)/shlibtool --silent
APACHE_COMPILE = $(COMPILE) -c $< && touch $@
APACHE_SH_COMPILE = $(SHLIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(EXTRA_INCLUDES) $(CPPFLAGS) $(CFLAGS) $(EXTRA_CFLAGS) -c $< && touch $@
SHLINK = $(SHLIBTOOL) --mode=link $(CCLD) $(CFLAGS) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@
-DEFS = -DHAVE_CONFIG_H -I. -I$(srcdir) -I$(DEPTH)
-
-top_builddir = $(DEPTH)
+DEFS = -DHAVE_CONFIG_H -I. -I$(srcdir) -I$(top_builddir)
.SUFFIXES:
.SUFFIXES: .S .c .lo .o .s .y .l .slo
View
4 configure.in
@@ -31,6 +31,8 @@ AC_PROG_INSTALL
dnl AC_PROG_RANLIB
dnl AC_PATH_PROG(PERL_PATH, perl)
+REENTRANCY_FLAGS
+
dnl various OS checks that apparently set required flags
AC_AIX
AC_ISC_POSIX
@@ -109,8 +111,6 @@ APACHE_INADDR_NONE
APACHE_EBCDIC
-REENTRANCY_FLAGS
-
AC_FUNC_SELECT_ARGTYPES
dnl Check if we'll actually need to cast select args all the time
View
5 modules/Makefile.in
@@ -1,9 +1,4 @@
-DEPTH = ..
-top_srcdir = @top_srcdir@
-srcdir = @srcdir@
-VPATH = @srcdir@
-
SUBDIRS = mpm $(MODULE_DIRS)
include $(top_srcdir)/build/rules.mk
View
5 modules/aaa/Makefile.in
@@ -1,8 +1,3 @@
-DEPTH = ../..
-top_srcdir = @top_srcdir@
-srcdir = @srcdir@
-VPATH = @srcdir@
-
include $(top_srcdir)/build/special.mk
View
5 os/Makefile.in
@@ -1,9 +1,4 @@
-DEPTH = ..
-top_srcdir = @top_srcdir@
-srcdir = @srcdir@
-VPATH = @srcdir@
-
SUBDIRS = $(top_srcdir)/$(OS_DIR)
include $(top_srcdir)/build/rules.mk
View
5 os/beos/Makefile.in
@@ -1,9 +1,4 @@
-DEPTH = ../..
-top_srcdir = @top_srcdir@
-srcdir = @srcdir@
-VPATH = @srcdir@
-
LTLIBRARY_NAME = libos.la
LTLIBRARY_SOURCES = os.c beosd.c iol_socket.c
View
5 os/os2/Makefile.in
@@ -1,9 +1,4 @@
-DEPTH = ../..
-top_srcdir = @top_srcdir@
-srcdir = @srcdir@
-VPATH = @srcdir@
-
LTLIBRARY_NAME = libos.la
LTLIBRARY_SOURCES = os.c os-inline.c util_os2.c iol_socket.c
View
5 os/unix/Makefile.in
@@ -1,9 +1,4 @@
-DEPTH = ../..
-top_srcdir = @top_srcdir@
-srcdir = @srcdir@
-VPATH = @srcdir@
-
LTLIBRARY_NAME = libos.la
LTLIBRARY_SOURCES = os.c os-inline.c unixd.c iol_socket.c
View
5 server/Makefile.in
@@ -1,9 +1,4 @@
-DEPTH = ..
-top_srcdir = @top_srcdir@
-srcdir = @srcdir@
-VPATH = @srcdir@
-
CLEANFILES = gen_test_char gen_uri_delims test_char.h uri_delims.h
LTLIBRARY_NAME = libmain.la
View
5 server/mpm/Makefile.in
@@ -1,9 +1,4 @@
-DEPTH = ../..
-top_srcdir = @top_srcdir@
-srcdir = @srcdir@
-VPATH = @srcdir@
-
SUBDIRS = $(MPM_NAME)
include $(top_srcdir)/build/rules.mk
View
5 server/mpm/dexter/Makefile.in
@@ -1,9 +1,4 @@
-DEPTH = ../../..
-top_srcdir = @top_srcdir@
-srcdir = @srcdir@
-VPATH = @srcdir@
-
LTLIBRARY_NAME = libdexter.la
LTLIBRARY_SOURCES = dexter.c scoreboard.c
View
5 server/mpm/mpmt_beos/Makefile.in
@@ -1,9 +1,4 @@
-DEPTH = ../../..
-top_srcdir = @top_srcdir@
-srcdir = @srcdir@
-VPATH = @srcdir@
-
LTLIBRARY_NAME = libmpmt_beos.la
LTLIBRARY_SOURCES = mpmt_beos.c scoreboard.c poll.c
View
5 server/mpm/mpmt_pthread/Makefile.in
@@ -1,9 +1,4 @@
-DEPTH = ../../..
-top_srcdir = @top_srcdir@
-srcdir = @srcdir@
-VPATH = @srcdir@
-
LTLIBRARY_NAME = libmpmt_pthread.la
LTLIBRARY_SOURCES = mpmt_pthread.c scoreboard.c
View
5 server/mpm/prefork/Makefile.in
@@ -1,9 +1,4 @@
-DEPTH = ../../..
-top_srcdir = @top_srcdir@
-srcdir = @srcdir@
-VPATH = @srcdir@
-
LTLIBRARY_NAME = libprefork.la
LTLIBRARY_SOURCES = prefork.c
View
5 server/mpm/spmt_os2/Makefile.in
@@ -1,9 +1,4 @@
-DEPTH = ../../..
-top_srcdir = @top_srcdir@
-srcdir = @srcdir@
-VPATH = @srcdir@
-
LTLIBRARY_NAME = libspmt_os2.la
LTLIBRARY_SOURCES = spmt_os2.c
View
5 srclib/Makefile.in
@@ -1,9 +1,4 @@
-DEPTH = ..
-top_srcdir = @top_srcdir@
-srcdir = @srcdir@
-VPATH = @srcdir@
-
SUBDIRS = apr
include $(top_srcdir)/build/rules.mk
View
6 support/Makefile.in
@@ -1,9 +1,4 @@
-DEPTH = ..
-top_srcdir = @top_srcdir@
-srcdir = @srcdir@
-VPATH = @srcdir@
-
PROGRAMS = htpasswd htdigest rotatelogs logresolve ab
targets = $(PROGRAMS)
@@ -12,7 +7,6 @@ PROGRAM_DEPENDENCIES = ../lib/apr/$(LIBPRE)apr.a \
../ap/libap.la
include $(top_srcdir)/build/rules.mk
-include $(top_srcdir)/build/program.mk
htpasswd_OBJECTS = htpasswd.lo
htpasswd: $(htpasswd_OBJECTS)
Please sign in to comment.
Something went wrong with that request. Please try again.