diff options
66 files changed, 584 insertions, 1499 deletions
diff --git a/.cvsignore b/.cvsignore index 6825bfc7b..3fe91f1e2 100644 --- a/.cvsignore +++ b/.cvsignore @@ -3,9 +3,8 @@ config.cache config.log config.status configure +libtool APRVARS -objs -.deps LibD LibR Debug @@ -14,3 +13,6 @@ Release *.opt *.plg apr.exports +aclocal.m4 +.libs +*.la @@ -1,5 +1,8 @@ Changes with APR b1 + *) Libtool'ized APR and converted all the makefiles to share rules + from helpers/rules.mk. [Greg Stein] + *) Remove a warning on FreeBSD. FreeBSD defines TCP_NO_PUSH, but we don't actually use it. This causes os_cork to be defined but not used. This patch keeps us from defining os_cork and os_uncork on diff --git a/Makefile.in b/Makefile.in index d7b1be310..7b9738a5d 100644 --- a/Makefile.in +++ b/Makefile.in @@ -1,22 +1,8 @@ # # APR (Apache Portable Runtime) library Makefile. # -SHELL=@SH@ # -# Macros for compilation commands -# -@SET_MAKE@ -MFLAGS_STATIC= -RM=@RM@ -CC=@CC@ -AWK=@AWK@ -CFLAGS=@CFLAGS@ @OPTIM@ -LIBS=@LIBS@ -LDFLAGS=@LDFLAGS@ $(LIBS) -AR=@AR@ -RANLIB=@RANLIB@ -# # Macros for supporting directories # INCDIR=./include @@ -30,81 +16,33 @@ MODULES=@MODULES@ SUBDIRS=@SUBDIRS@ #shmem/@OSDIR@ -LIBAPR = @LIBPREFIX@apr.a +LIBAPR = @LIBPREFIX@apr.la TARGET_EXPORTS = apr.exports # -# Rules for turning inputs into outputs -# -.c.o: - $(CC) $(CFLAGS) -c $(INCLUDES) $< - -# # Rules for building specific targets, starting with 'all' for # building the entire package. # -all: Makefile $(LIBAPR) delete-exports $(TARGET_EXPORTS) - -$(LIBAPR): $(MODULES) subdirs - @rm -rf objs - @mkdir objs - @rm -f $@ - for i in $(SUBDIRS); do cp $$i/*.o objs ; done; - $(AR) cr $@ objs/*.o - $(RANLIB) $@ - -clean: subdirs_clean - $(RM) -f *.o *.a *.so objs/*.o apr.exports - -depend: subdirs_depend - -distclean: subdirs_distclean - -$(RM) -f include/apr.h include/arch/unix/apr_private.h - -$(RM) -f *.o *.a *.so - -$(RM) -f config.cache config.status config.log - -$(RM) -f Makefile - -$(RM) -f APRVARS - -$(RM) -rf objs - cd test; $(MAKE) distclean; cd .. - -extraclean: distclean - -$(RM) -f configure include/arch/unix/apr_private.h.in - -subdirs: - @for i in $(SUBDIRS); do \ - echo "===> $(SDP)lib/apr/$$i"; \ - ( cd $$i && $(MAKE) $(MFLAGS_STATIC) SDP='$(SDP)' \ - CC='$(CC)' AUX_CFLAGS='$(AUX_CFLAGS)' RANLIB='$(RANLIB)' ) \ - || exit 1; \ - echo "<=== $(SDP)lib/apr/$$i"; \ - done; +TARGETS = $(LIBAPR) delete-exports $(TARGET_EXPORTS) -subdirs_depend: - @for i in $(SUBDIRS); do \ - echo "===> $(SDP)lib/apr/$$i"; \ - ( cd $$i && $(MAKE) $(MFLAGS_STATIC) SDP='$(SDP)' depend ) \ - || exit 1; \ - echo "<=== $(SDP)lib/apr/$$i"; \ - done; +# bring in rules.mk for standard functionality +@INCLUDE_RULES@ -subdirs_clean: - @for i in $(SUBDIRS); do \ - echo "===> $(SDP)lib/apr/$$i"; \ - ( cd $$i && $(MAKE) $(MFLAGS_STATIC) SDP='$(SDP)' clean ) \ - || exit 1; \ - echo "<=== $(SDP)lib/apr/$$i"; \ - done; +CLEAN_TARGETS = $(TARGET_EXPORTS) +DISTCLEAN_TARGETS = config.cache config.log config.status \ + include/apr.h include/arch/unix/apr_private.h \ + APRVARS +EXTRACLEAN_TARGETS = configure libtool aclocal.m4 \ + include/arch/unix/apr_private.h.in -subdirs_distclean: - @for i in $(SUBDIRS); do \ - echo "===> $(SDP)lib/apr/$$i"; \ - ( cd $$i && $(MAKE) $(MFLAGS_STATIC) SDP='$(SDP)' distclean ) \ - || exit 1; \ - echo "<=== $(SDP)lib/apr/$$i"; \ - done; +### fix this up at some point (install location) +libdir = /usr/local/lib -install: all +$(LIBAPR): $(MODULES) + @for i in $(SUBDIRS); do objects="$$objects $$i/*.lo"; done ; \ + echo $(LINK) -rpath $(libdir) $$objects ; \ + $(LINK) -rpath $(libdir) $$objects delete-exports: @if test -f $(TARGET_EXPORTS); then \ @@ -1,5 +1,5 @@ APACHE PORTABLE RUNTIME (APR) LIBRARY STATUS: -*-text-*- -Last modified at [$Date: 2001/01/07 00:35:37 $] +Last modified at [$Date: 2001/01/09 11:05:33 $] Release: @@ -52,13 +52,6 @@ RELEASE NON-SHOWSTOPPERS BUT WOULD BE REAL NICE TO WRAP THESE UP: * The MM library is built as static and shared library. This should be set up to build only the required version. - * use libtool - Status: Greg +1 (volunteers), Ryan +1(?) - Waiting for commentary from jimjag - - * snarf rules.mk(.in) from APRUTIL to simplify makefiles - Status: Greg +1 (volunteers), Sascha +1, rbb -0.5 - * add apr_crypt() and APR_HAS_CRYPT for apps to determine whether the crypt() function is available, and a way to call it (whether it is located in libc, libcrypt, or libufc) @@ -93,6 +86,8 @@ RELEASE NON-SHOWSTOPPERS BUT WOULD BE REAL NICE TO WRAP THESE UP: * use os_(un)cork in network_io/unix/sendrecv.c for FreeBSD's sendfile implementation. + * toss the per-Makefile setup of INCLUDES; shift to rules.mk.in + Documentation that needs writing: diff --git a/aclocal.m4 b/aclocal.m4 deleted file mode 100644 index f8208317b..000000000 --- a/aclocal.m4 +++ /dev/null @@ -1,536 +0,0 @@ -dnl ## -dnl ## -dnl ## -define(AC_USE_FUNCTION,[dnl -AC_CHECK_FUNCS($1) -if test ".$ac_func_$1" = .yes; then -AC_DEFINE(USE_$2) -fi -])dnl -dnl ## -dnl ## -dnl ## -AC_DEFUN(AC_CHECK_DEFINE_FILES,[ - AC_CACHE_CHECK([for $1 in $2],ac_cv_define_$1,[ - ac_cv_define_$1=no - for curhdr in $2 - do - AC_EGREP_CPP(YES_IS_DEFINED, [ - #include <$curhdr> - #ifdef $1 - YES_IS_DEFINED - #endif - ], ac_cv_define_$1=yes) - done - ]) - if test "$ac_cv_define_$1" = "yes"; then - AC_DEFINE(HAVE_$1) - fi -]) -dnl ## -dnl ## -dnl ## -AC_DEFUN(AC_CHECK_DEFINE,[ - AC_CACHE_CHECK([for $1 in $2],ac_cv_define_$1,[ - AC_EGREP_CPP(YES_IS_DEFINED, [ - #include <$2> - #ifdef $1 - YES_IS_DEFINED - #endif - ], ac_cv_define_$1=yes, ac_cv_define_$1=no) - ]) - if test "$ac_cv_define_$1" = "yes"; then - AC_DEFINE(HAVE_$1) - fi -]) -dnl ## -dnl ## -dnl ## -define(AC_IFALLYES,[dnl -ac_rc=yes -for ac_spec in $1; do - ac_type=`echo "$ac_spec" | sed -e 's/:.*$//'` - ac_item=`echo "$ac_spec" | sed -e 's/^.*://'` - case $ac_type in - header ) - ac_item=`echo "$ac_item" | sed 'y%./+-%__p_%'` - ac_var="ac_cv_header_$ac_item" - ;; - file ) - ac_item=`echo "$ac_item" | sed 'y%./+-%__p_%'` - ac_var="ac_cv_file_$ac_item" - ;; - func ) ac_var="ac_cv_func_$ac_item" ;; - define ) ac_var="ac_cv_define_$ac_item" ;; - custom ) ac_var="$ac_item" ;; - esac - eval "ac_val=\$$ac_var" - if test ".$ac_val" != .yes; then - ac_rc=no - break - fi -done -if test ".$ac_rc" = .yes; then - : - $2 -else - : - $3 -fi -])dnl -dnl ## -dnl ## -dnl ## -define(AC_BEGIN_DECISION,[dnl -ac_decision_item='$1' -ac_decision_msg='FAILED' -ac_decision='' -])dnl -define(AC_DECIDE,[dnl -ac_decision='$1' -ac_decision_msg='$2' -ac_decision_$1=yes -ac_decision_$1_msg='$2' -])dnl -define(AC_DECISION_OVERRIDE,[dnl - ac_decision='' - for ac_item in $1; do - eval "ac_decision_this=\$ac_decision_${ac_item}" - if test ".$ac_decision_this" = .yes; then - ac_decision=$ac_item - eval "ac_decision_msg=\$ac_decision_${ac_item}_msg" - fi - done -])dnl -define(AC_DECISION_FORCE,[dnl -ac_decision="$1" -eval "ac_decision_msg=\"\$ac_decision_${ac_decision}_msg\"" -])dnl -define(AC_END_DECISION,[dnl -if test ".$ac_decision" = .; then - echo "[$]0:Error: decision on $ac_decision_item failed" 1>&2 - exit 1 -else - if test ".$ac_decision_msg" = .; then - ac_decision_msg="$ac_decision" - fi - AC_DEFINE_UNQUOTED(${ac_decision_item}) - AC_MSG_RESULT([decision on $ac_decision_item... $ac_decision_msg]) -fi -])dnl - -dnl ### AC_TRY_RUN had some problems actually using a programs return code, -dnl ### so I am re-working it here to be used in APR's configure script. -dnl MY_TRY_RUN(PROGRAM, [ACTION-IF-TRUE [, ACTION-IF-FALSE -dnl [, ACTION-IF-CROSS-COMPILING]]]) -AC_DEFUN(MY_TRY_RUN, -[if test "$cross_compiling" = yes; then - ifelse([$4], , - [errprint(__file__:__line__: warning: [AC_TRY_RUN] called without default to allow cross compiling -)dnl - AC_MSG_ERROR(can not run test program while cross compiling)], - [$4]) -else - MY_TRY_RUN_NATIVE([$1], [$2], [$3]) -fi -]) - -dnl Like AC_TRY_RUN but assumes a native-environment (non-cross) compiler. -dnl MY_TRY_RUN_NATIVE(PROGRAM, [ACTION-IF-TRUE [, ACTION-IF-FALSE]]) -AC_DEFUN(MY_TRY_RUN_NATIVE, -[cat > conftest.$ac_ext <<EOF -[#]line __oline__ "configure" -#include "confdefs.h" -ifelse(AC_LANG, CPLUSPLUS, [#ifdef __cplusplus -extern "C" void exit(int); -#endif -])dnl -[$1] -EOF -if AC_TRY_EVAL(ac_link) && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -then -dnl Don't remove the temporary files here, so they can be examined. - ifelse([$2], , :, [$2]) -else -ifelse([$3], , , [ $3 - rm -fr conftest* -])dnl -fi -rm -fr conftest*]) -dnl A variant of AC_CHECK_SIZEOF which allows the checking of -dnl sizes of non-builtin types -dnl AC_CHECK_SIZEOF_EXTENDED(INCLUDES, TYPE [, CROSS_SIZE]) -AC_DEFUN(AC_CHECK_SIZEOF_EXTENDED, -[changequote(<<,>>)dnl -dnl The name to #define -define(<<AC_TYPE_NAME>>, translit(sizeof_$2, [a-z *], [A-Z_P]))dnl -dnl The cache variable -define(<<AC_CV_NAME>>, translit(ac_cv_sizeof_$2, [ *],[<p>]))dnl -changequote([, ])dnl -AC_MSG_CHECKING(size of $2) -AC_CACHE_VAL(AC_CV_NAME, -[AC_TRY_RUN([#include <stdio.h> -$1 -main() -{ - FILE *f=fopen("conftestval","w"); - if (!f) exit(1); - fprintf(f, "%d\n", sizeof($2)); - exit(0); -}], AC_CV_NAME=`cat conftestval`, AC_CV_NAME=0, ifelse([$3],,, -AC_CV_NAME=$3))])dnl -AC_MSG_RESULT($AC_CV_NAME) -AC_DEFINE_UNQUOTED(AC_TYPE_NAME, $AC_CV_NAME) -undefine([AC_TYPE_NAME])dnl -undefine([AC_CV_NAME])dnl -]) - -dnl -dnl check for working getaddrinfo() -dnl - -AC_DEFUN(APR_CHECK_WORKING_GETADDRINFO,[ - AC_CACHE_CHECK(for working getaddrinfo, ac_cv_working_getaddrinfo,[ - AC_TRY_RUN( [ -#ifdef HAVE_NETDB_H -#include <netdb.h> -#endif -#ifdef HAVE_STRING_H -#include <string.h> -#endif -#ifdef HAVE_SYS_SOCKET_H -#include <sys/socket.h> -#endif - -void main(void) { - struct addrinfo hints, *ai; - int error; - - memset(&hints, 0, sizeof(hints)); - hints.ai_family = AF_UNSPEC; - hints.ai_socktype = SOCK_STREAM; - error = getaddrinfo("127.0.0.1", "8080", &hints, &ai); - if (error) { - exit(1); - } - else { - exit(0); - } -} -],[ - ac_cv_working_getaddrinfo="yes" -],[ - ac_cv_working_getaddrinfo="no" -],[ - ac_cv_working_getaddrinfo="yes" -])]) -if test "$ac_cv_working_getaddrinfo" = "yes"; then - AC_DEFINE(HAVE_GETADDRINFO, 1, [Define if getaddrinfo exists and works well enough for APR]) -fi -]) - -dnl -dnl check for gethostbyname() which handles numeric address strings -dnl - -AC_DEFUN(APR_CHECK_GETHOSTBYNAME_NAS,[ - AC_CACHE_CHECK(for gethostbyname() which handles numeric address strings, ac_cv_gethostbyname_nas,[ - AC_TRY_RUN( [ -#ifdef HAVE_SYS_TYPES_H -#include <sys/types.h> -#endif -#ifdef HAVE_NETINET_IN_H -#include <netinet/in.h> -#endif -#ifdef HAVE_ARPA_INET_H -#include <arpa/inet.h> -#endif -#ifdef HAVE_NETDB_H -#include <netdb.h> -#endif -#ifdef HAVE_STDLIB_H -#include <stdlib.h> -#endif -void main(void) { - struct hostent *he = gethostbyname("127.0.0.1"); - if (he == NULL) { - exit(1); - } - else { - exit(0); - } -} -],[ - ac_cv_gethostbyname_nas="yes" -],[ - ac_cv_gethostbyname_nas="no" -],[ - ac_cv_gethostbyname_nas="yes" -])]) -if test "$ac_cv_gethostbyname_nas" = "yes"; then - AC_DEFINE(GETHOSTBYNAME_HANDLES_NAS, 1, [Define if gethostbyname() handles nnn.nnn.nnn.nnn]) -fi -]) - -dnl -dnl check for socklen_t, fall back to unsigned int -dnl - -AC_DEFUN(APR_CHECK_SOCKLEN_T,[ -AC_CACHE_CHECK(for socklen_t, ac_cv_socklen_t,[ -AC_TRY_COMPILE([ -#ifdef HAVE_SYS_TYPES_H -#include <sys/types.h> -#endif -#ifdef HAVE_SYS_SOCKET_H -#include <sys/socket.h> -#endif -],[ -socklen_t foo = (socklen_t) 0; -],[ - ac_cv_socklen_t=yes -],[ - ac_cv_socklen_t=no -]) -]) - -if test "$ac_cv_socklen_t" = "yes"; then - AC_DEFINE(HAVE_SOCKLEN_T, 1, [Whether you have socklen_t]) -fi -]) - -dnl Check for ranlib but, unlike the check provided with autoconf, set -dnl RANLIB to "true" if there is no ranlib instead of setting it to ":". -dnl OS/390 doesn't have ranlib and the make utility doesn't parse "RANLIB=:" -dnl the way we might want it to. - -AC_DEFUN(AC_PROG_RANLIB_NC, -[AC_CHECK_TOOL(RANLIB, ranlib, true)]) - -AC_DEFUN(APR_EBCDIC,[ - AC_CACHE_CHECK([whether system uses EBCDIC],ac_cv_ebcdic,[ - AC_TRY_RUN( [ -int main(void) { - return (unsigned char)'A' != (unsigned char)0xC1; -} -],[ - ac_cv_ebcdic="yes" -],[ - ac_cv_ebcdic="no" -],[ - ac_cv_ebcdic="no" -])]) - if test "$ac_cv_ebcdic" = "yes"; then - apr_charset_ebcdic=1 - else - apr_charset_ebcdic=0 - fi - AC_SUBST(apr_charset_ebcdic) -]) - -AC_DEFUN(APR_PREPARE_MM_DIR,[ -dnl #----------------------------- Prepare mm directory for VPATH support -if test -n "$USE_MM" && test -n "$USE_VPATH"; then - test -d $mm_dir || $MKDIR $mm_dir - - for i in shtool config.guess config.sub fbtool ltconfig \ - ltmain.sh mm_vers.c; do - test -r $mm_dir/$i || ln -s $abs_srcdir/$mm_dir/$i $mm_dir/$i - done -fi -]) - -AC_DEFUN(APR_CHECK_INET_ADDR,[ -AC_CACHE_CHECK(for inet_addr, ac_cv_func_inet_addr,[ -AC_TRY_COMPILE([ -#ifdef HAVE_SYS_TYPES_H -#include <sys/types.h> -#endif -#ifdef HAVE_ARPA_INET_H -#include <arpa/inet.h> -#endif -],[ -inet_addr("127.0.0.1"); -],[ - ac_cv_func_inet_addr=yes -],[ - ac_cv_func_inet_addr=no -]) -]) - -if test "$ac_cv_func_inet_addr" = "yes"; then - have_inet_addr=1 -else - have_inet_addr=0 -fi -]) - -AC_DEFUN(APR_CHECK_INET_NETWORK,[ -AC_CACHE_CHECK(for inet_network, ac_cv_func_inet_network,[ -AC_TRY_COMPILE([ -#ifdef HAVE_SYS_TYPES_H -#include <sys/types.h> -#endif -#ifdef HAVE_ARPA_INET_H -#include <arpa/inet.h> -#endif -],[ -inet_network("127.0.0.1"); -],[ - ac_cv_func_inet_network=yes -],[ - ac_cv_func_inet_network=no -]) -]) - -if test "$ac_cv_func_inet_network" = "yes"; then - have_inet_network=1 -else - have_inet_network=0 -fi -]) - -AC_DEFUN(APR_CHECK_SOCKADDR_IN6,[ -AC_CACHE_CHECK(for sockaddr_in6, ac_cv_define_sockaddr_in6,[ -AC_TRY_COMPILE([ -#ifdef HAVE_SYS_TYPES_H -#include <sys/types.h> -#endif -#ifdef HAVE_NETINET_IN_H -#include <netinet/in.h> -#endif -],[ -struct sockaddr_in6 sa; -],[ - ac_cv_define_sockaddr_in6=yes -],[ - ac_cv_define_sockaddr_in6=no -]) -]) - -if test "$ac_cv_define_sockaddr_in6" = "yes"; then - have_sockaddr_in6=1 -else - have_sockaddr_in6=0 -fi -]) - -# -# Check to see if this platform includes sa_len in it's -# struct sockaddr. If it does it changes the length of sa_family -# which could cause us problems -# -AC_DEFUN(APR_CHECK_SOCKADDR_SA_LEN,[ -AC_CACHE_CHECK(for sockaddr sa_len, ac_cv_define_sockaddr_sa_len,[ -AC_TRY_COMPILE([ -#ifdef HAVE_SYS_TYPES_H -#include <sys/types.h> -#endif -#ifdef HAVE_NETINET_IN_H -#include <netinet/in.h> -#endif -],[ -struct sockaddr_in sai; -int i = sai.sin_len; -],[ - ac_cv_define_sockaddr_sa_len=yes -],[ - ac_cv_define_sockaddr_sa_len=no -]) -]) - -if test "$ac_cv_define_sockaddr_sa_len" = "yes"; then - AC_DEFINE(HAVE_SOCKADDR_SA_LEN, 1 ,[Define if we have length field in sockaddr_in]) -fi -]) - -dnl -dnl APR_INADDR_NONE -dnl -dnl checks for missing INADDR_NONE macro -dnl -AC_DEFUN(APR_INADDR_NONE,[ - AC_CACHE_CHECK(whether system defines INADDR_NONE, ac_cv_inaddr_none,[ - AC_TRY_COMPILE([ -#ifdef HAVE_SYS_TYPES_H -#include <sys/types.h> -#endif -#ifdef HAVE_SYS_SOCKET_H -#include <sys/socket.h> -#endif -#ifdef HAVE_NETINET_IN_H -#include <netinet/in.h> -#endif -#ifdef HAVE_ARPA_INET_H -#include <arpa/inet.h> -#endif -],[ -unsigned long foo = INADDR_NONE; -],[ - ac_cv_inaddr_none=yes -],[ - ac_cv_inaddr_none=no -])]) - if test "$ac_cv_inaddr_none" = "no"; then - apr_inaddr_none="((unsigned int) 0xffffffff)" - else - apr_inaddr_none="INADDR_NONE" - fi -]) - -dnl -dnl APR_CHECK_H_ERRNO_FLAG -dnl -dnl checks which flags are necessary for <netdb.h> to define h_errno -dnl -AC_DEFUN(APR_H_ERRNO_COMPILE_CHECK,[ - if test x$1 != x; then - CFLAGS="-D$1 $CFLAGS" - fi - AC_TRY_COMPILE([ -#ifdef HAVE_SYS_TYPES_H -#include <sys/types.h> -#endif -#ifdef HAVE_NETDB_H -#include <netdb.h> -#endif -],[ -int h_e = h_errno; -],[ - if test x$1 != x; then - ac_cv_h_errno_cflags="$1" - else - ac_cv_h_errno_cflags=yes - fi -],[ - ac_cv_h_errno_cflags=no -])]) -AC_DEFUN(APR_CHECK_H_ERRNO_FLAG,[ - AC_MSG_CHECKING([for h_errno in netdb.h]) - AC_CACHE_VAL(ac_cv_h_errno_cflags,[ - APR_H_ERRNO_COMPILE_CHECK - if test "$ac_cv_h_errno_cflags" = "no"; then - ac_save="$CFLAGS" - for flag in _XOPEN_SOURCE_EXTENDED; do - APR_H_ERRNO_COMPILE_CHECK($flag) - if test "$ac_cv_h_errno_cflags" != "no"; then - break - fi - done - CFLAGS="$ac_save" - fi - ]) - if test "$ac_cv_h_errno_cflags" != "no"; then - if test "$ac_cv_h_errno_cflags" != "yes"; then - CFLAGS="-D$ac_cv_h_errno_cflags $CFLAGS" - AC_MSG_RESULT([yes, with -D$ac_cv_h_errno_cflags]) - else - AC_MSG_RESULT([$ac_cv_h_errno_cflags]) - fi - else - AC_MSG_RESULT([$ac_cv_h_errno_cflags]) - fi -]) - -sinclude(apr_common.m4) -sinclude(hints.m4) @@ -1,6 +1,34 @@ #!/bin/sh +# +# Build aclocal.m4 from libtool's libtool.m4 and our own M4 files. +# +ltpath=`helpers/PrintPath libtoolize` +ltpath=`dirname $ltpath` +ltfile=`cd $ltpath/../share/aclocal ; pwd`/libtool.m4 +echo "Incorporating $ltfile into aclocal.m4 ..." +echo "dnl THIS FILE IS AUTOMATICALLY GENERATED BY buildconf" > aclocal.m4 +echo "dnl edits here will be lost" >> aclocal.m4 +cat helpers/apr-conf.m4 apr_common.m4 hints.m4 $ltfile >> aclocal.m4 + +# +# Create the libtool helper files +# +# Note: we copy (rather than link) them to simplify distribution. +# Note: APR supplies its own config.guess and config.sub -- we do not +# rely on libtool's versions +# +echo "Copying libtool helper files ..." +$ltpath/libtoolize --copy + +# +# Generate the autoconf header and ./configure +# +echo "Creating include/arch/unix/apr_private.h.in ..." autoheader + +echo "Creating configure ..." +### do some work to toss config.cache? autoconf (cd shmem/unix/mm && autoconf) diff --git a/configure.in b/configure.in index eec40e72b..f6dbeb009 100644 --- a/configure.in +++ b/configure.in @@ -22,6 +22,10 @@ dnl Absolute source/build directory abs_srcdir=`(cd $srcdir && pwd)` abs_builddir=`pwd` +dnl Libtool needs this symbol +top_builddir="$abs_srcdir" +AC_SUBST(top_builddir) + dnl Get location of helpers directory dnl XXX This assumes that APR "lives" under Apache. dnl XXX We'll need to fix this when we pull it out. @@ -42,12 +46,10 @@ LIBPREFIX='lib' dnl # Checks for programs. AC_PROG_CC -AC_PROG_RANLIB_NC AC_PROG_MAKE_SET AC_PROG_AWK AC_CHECK_PROG(RM, rm, rm) AC_CHECK_TOOL(AR, ar, ar) -SO_LDFLAG="-shared" # This macro needs to be here in case we are on an AIX box. AC_AIX @@ -60,6 +62,12 @@ if test ".$SH" = . -a -f /bin/sh; then fi AC_CHECK_PROG(SH, sh, sh) +dnl +dnl prep libtool +dnl +echo "performing libtool configuration..." +AC_PROG_LIBTOOL + dnl #----------------------------- Checks for compiler flags nl=' ' @@ -106,7 +114,6 @@ case "$OS" in USE_MM=yes AC_CHECK_DEFINE(BONE_VERSION, sys/socket.h) eolstr="\\n" - SO_LDFLAG="-nostart" ;; *os390) OSDIR="os390" @@ -123,7 +130,6 @@ case "$OS" in esac AC_SUBST(eolstr) -AC_SUBST(SO_LDFLAG) dnl #----------------------------- Checking for Shared Memory Support echo $ac_n "${nl}Checking for Shared Memory Support...${nl}" @@ -851,7 +857,6 @@ dnl #----------------------------- Construct the files AC_SUBST(LDLIBS) AC_SUBST(OPTIM) -AC_SUBST(RANLIB) AC_SUBST(AR) AC_SUBST(RM) AC_SUBST(OSDIR) @@ -884,6 +889,19 @@ if test -n "$CPPFLAGS"; then CFLAGS="$CFLAGS $CPPFLAGS" fi +dnl +dnl BSD/OS (BSDi) needs to use a different include syntax in the Makefiles +dnl +case "$host_alias" in +*bsdi*) + INCLUDE_RULES=".include \"$top_builddir/helpers/rules.mk\"" + ;; +*) + INCLUDE_RULES="include $top_builddir/helpers/rules.mk" + ;; +esac +AC_SUBST(INCLUDE_RULES) + SAVE_FILES="include/apr.h include/arch/unix/apr_private.h" for i in $SAVE_FILES; do @@ -893,10 +911,12 @@ done dir=include/arch/unix test -d $dir || $MKDIR $dir -AC_OUTPUT($MAKEFILE1 $MAKEFILE2 $MAKEFILE3 include/apr.h APRVARS,[ - -SAVE_FILES="include/apr.h include/apr_private.h" - +AC_OUTPUT([ + $MAKEFILE1 $MAKEFILE2 $MAKEFILE3 + include/apr.h + APRVARS + helpers/rules.mk +],[ for i in $SAVE_FILES; do if cmp -s $i $i.save 2>/dev/null; then mv $i.save $i @@ -904,7 +924,6 @@ for i in $SAVE_FILES; do fi rm -f $i.save done - ]) dnl #----------------------------- Fixup Makefiles for VPATH support diff --git a/dso/aix/.cvsignore b/dso/aix/.cvsignore new file mode 100644 index 000000000..06e18a7aa --- /dev/null +++ b/dso/aix/.cvsignore @@ -0,0 +1,3 @@ +Makefile +*.lo +.libs diff --git a/dso/aix/Makefile.in b/dso/aix/Makefile.in index 22ac4f1f8..1fed55114 100644 --- a/dso/aix/Makefile.in +++ b/dso/aix/Makefile.in @@ -1,35 +1,10 @@ -RM=@RM@ -CC=@CC@ -RANLIB=@RANLIB@ -CFLAGS=@CFLAGS@ @OPTIM@ -LIBS=@LIBS@ -LDFLAGS=@LDFLAGS@ $(LIBS) -INCDIR=../../include -INCLUDES=-I$(INCDIR) -I$(INCDIR)/arch -MKDEP=../../helpers/mkdep.sh - -LIB=libdso.a - -OBJS=dso.o - -.c.o: - $(CC) $(CFLAGS) -c $(INCLUDES) $< -all: $(LIB) +TARGETS = dso.lo -clean: - $(RM) -f *.o *.a *.so +# bring in rules.mk for standard functionality +@INCLUDE_RULES@ -distclean: clean - -$(RM) -f Makefile - - -$(LIB): $(OBJS) - $(RM) -f $@ - $(AR) cr $@ $(OBJS) - $(RANLIB) $@ - -depend: - $(MKDEP) $(INCLUDES) $(CFLAGS) *.c +INCDIR=../../include +INCLUDES=-I$(INCDIR) -I$(INCDIR)/arch # DO NOT REMOVE diff --git a/dso/beos/.cvsignore b/dso/beos/.cvsignore index 550bd25cd..06e18a7aa 100644 --- a/dso/beos/.cvsignore +++ b/dso/beos/.cvsignore @@ -1,2 +1,3 @@ Makefile - +*.lo +.libs diff --git a/dso/beos/Makefile.in b/dso/beos/Makefile.in index 266554101..7599158d2 100644 --- a/dso/beos/Makefile.in +++ b/dso/beos/Makefile.in @@ -1,35 +1,11 @@ -CC=@CC@ -RANLIB=@RANLIB@ -CFLAGS=@CFLAGS@ @OPTIM@ -LIBS=@LIBS@ -LDFLAGS=@LDFLAGS@ $(LIBS) -INCDIR=../../include -DEFOSDIR=$(INCDIR)/arch/@DEFAULT_OSDIR@ -INCLUDES=-I$(INCDIR) -I$(INCDIR)/arch -I$(DEFOSDIR) -MKDEP=../../helpers/mkdep.sh - -LIB=libdso.a - -OBJS=dso.o - -.c.o: - $(CC) $(CFLAGS) -c $(INCLUDES) $< -all: $(LIB) +TARGETS = dso.lo -clean: - $(RM) -f *.o *.a *.so +# bring in rules.mk for standard functionality +@INCLUDE_RULES@ -distclean: clean - -$(RM) -f Makefile - - -$(LIB): $(OBJS) - $(RM) -f $@ - $(AR) cr $@ $(OBJS) - $(RANLIB) $@ - -depend: - $(MKDEP) $(INCLUDES) $(CFLAGS) *.c +INCDIR=../../include +DEFOSDIR=$(INCDIR)/arch/@DEFAULT_OSDIR@ +INCLUDES=-I$(INCDIR) -I$(INCDIR)/arch -I$(DEFOSDIR) # DO NOT REMOVE diff --git a/dso/os2/.cvsignore b/dso/os2/.cvsignore index f3c7a7c5d..06e18a7aa 100644 --- a/dso/os2/.cvsignore +++ b/dso/os2/.cvsignore @@ -1 +1,3 @@ Makefile +*.lo +.libs diff --git a/dso/os2/Makefile.in b/dso/os2/Makefile.in index ba2385b0a..fe018d7d4 100644 --- a/dso/os2/Makefile.in +++ b/dso/os2/Makefile.in @@ -1,37 +1,12 @@ -SHELL=@SH@ -CC=@CC@ -RANLIB=@RANLIB@ -CFLAGS=@CFLAGS@ @OPTIM@ -LIBS=@LIBS@ -LDFLAGS=@LDFLAGS@ $(LIBS) + +TARGETS = dso.lo + +# bring in rules.mk for standard functionality +@INCLUDE_RULES@ + INCDIR=../../include OSDIR=$(INCDIR)/arch/@OSDIR@ DEFOSDIR=$(INCDIR)/arch/@DEFAULT_OSDIR@ INCLUDES=-I$(INCDIR) -I$(OSDIR) -I$(DEFOSDIR) -MKDEP=../../helpers/mkdep.sh - -LIB=libdso.a - -OBJS=dso.o - -.c.o: - $(CC) $(CFLAGS) -c $(INCLUDES) $< - -all: $(LIB) - -clean: - $(RM) -f *.o *.a *.so - -distclean: clean - -$(RM) -f Makefile - - -$(LIB): $(OBJS) - $(RM) -f $@ - $(AR) cr $@ $(OBJS) - $(RANLIB) $@ - -depend: - $(MKDEP) $(INCLUDES) $(CFLAGS) *.c # DO NOT REMOVE diff --git a/dso/os390/.cvsignore b/dso/os390/.cvsignore index f3c7a7c5d..06e18a7aa 100644 --- a/dso/os390/.cvsignore +++ b/dso/os390/.cvsignore @@ -1 +1,3 @@ Makefile +*.lo +.libs diff --git a/dso/os390/Makefile.in b/dso/os390/Makefile.in index 134195b68..1fed55114 100644 --- a/dso/os390/Makefile.in +++ b/dso/os390/Makefile.in @@ -1,34 +1,10 @@ -RM=@RM@ -CC=@CC@ -RANLIB=@RANLIB@ -CFLAGS=@CFLAGS@ @OPTIM@ -LIBS=@LIBS@ -LDFLAGS=@LDFLAGS@ $(LIBS) -INCDIR=../../include -INCLUDES=-I$(INCDIR) -I$(INCDIR)/arch -MKDEP=../../helpers/mkdep.sh - -LIB=libdso.a - -OBJS=dso.o - -.c.o: - $(CC) $(CFLAGS) -c $(INCLUDES) $< -all: $(LIB) +TARGETS = dso.lo -clean: - $(RM) -f *.o *.a *.so +# bring in rules.mk for standard functionality +@INCLUDE_RULES@ -$(LIB): $(OBJS) - $(RM) -f $@ - $(AR) cr $@ $(OBJS) - $(RANLIB) $@ - -distclean: clean - -$(RM) -f Makefile - -depend: - $(MKDEP) $(INCLUDES) $(CFLAGS) *.c +INCDIR=../../include +INCLUDES=-I$(INCDIR) -I$(INCDIR)/arch # DO NOT REMOVE diff --git a/dso/unix/.cvsignore b/dso/unix/.cvsignore index f3c7a7c5d..06e18a7aa 100644 --- a/dso/unix/.cvsignore +++ b/dso/unix/.cvsignore @@ -1 +1,3 @@ Makefile +*.lo +.libs diff --git a/dso/unix/Makefile.in b/dso/unix/Makefile.in index c3d9c2b42..21cac34c2 100644 --- a/dso/unix/Makefile.in +++ b/dso/unix/Makefile.in @@ -1,38 +1,12 @@ -RM=@RM@ -CC=@CC@ -AR=@AR@ -RANLIB=@RANLIB@ -CFLAGS=@CFLAGS@ @OPTIM@ -LIBS=@LIBS@ -LDFLAGS=@LDFLAGS@ $(LIBS) + +TARGETS = dso.lo + +# bring in rules.mk for standard functionality +@INCLUDE_RULES@ + INCDIR=../../include INCDIR2=$(INCDIR)/arch INCDIR3=$(INCDIR)/arch/unix INCLUDES=-I$(INCDIR) -I$(INCDIR2) -I$(INCDIR3) -MKDEP=../../helpers/mkdep.sh - -LIB=libdso.a - -OBJS=dso.o - -.c.o: - $(CC) $(CFLAGS) -c $(INCLUDES) $< - -all: $(LIB) - -clean: - $(RM) -f *.o *.a *.so - -distclean: clean - -$(RM) -f Makefile - - -$(LIB): $(OBJS) - $(RM) -f $@ - $(AR) cr $@ $(OBJS) - $(RANLIB) $@ - -depend: - $(MKDEP) $(INCLUDES) $(CFLAGS) *.c # DO NOT REMOVE diff --git a/file_io/os2/.cvsignore b/file_io/os2/.cvsignore index f3c7a7c5d..06e18a7aa 100644 --- a/file_io/os2/.cvsignore +++ b/file_io/os2/.cvsignore @@ -1 +1,3 @@ Makefile +*.lo +.libs diff --git a/file_io/os2/Makefile.in b/file_io/os2/Makefile.in index f413b3dac..50c758437 100644 --- a/file_io/os2/Makefile.in +++ b/file_io/os2/Makefile.in @@ -1,45 +1,22 @@ -CC=@CC@ -RANLIB=@RANLIB@ -CFLAGS=@CFLAGS@ @OPTIM@ -LIBS=@LIBS@ -LDFLAGS=@LDFLAGS@ $(LIBS) + +TARGETS = \ + dir.lo \ + fileacc.lo \ + filedup.lo \ + filestat.lo \ + open.lo \ + pipe.lo \ + readwrite.lo \ + seek.lo \ + flock.lo \ + maperrorcode.lo + +# bring in rules.mk for standard functionality +@INCLUDE_RULES@ + INCDIR=../../include OSDIR=$(INCDIR)/arch/@OSDIR@ DEFOSDIR=$(INCDIR)/arch/@DEFAULT_OSDIR@ INCLUDES=-I$(INCDIR) -I$(OSDIR) -I$(DEFOSDIR) -MKDEP=../../helpers/mkdep.sh - -LIB=file.a - -OBJS=dir.o \ - fileacc.o \ - filedup.o \ - filestat.o \ - open.o \ - pipe.o \ - readwrite.o \ - seek.o \ - flock.o \ - maperrorcode.o - -.c.o: - $(CC) $(CFLAGS) -c $(INCLUDES) $< - -all: $(LIB) - -clean: - $(RM) -f *.o *.a *.so - -distclean: clean - -$(RM) -f Makefile - - -$(LIB): $(OBJS) - $(RM) -f $@ - $(AR) cr $@ $(OBJS) - $(RANLIB) $@ - -depend: - $(MKDEP) $(INCLUDES) $(CFLAGS) *.c # DO NOT REMOVE diff --git a/file_io/unix/.cvsignore b/file_io/unix/.cvsignore index f3c7a7c5d..06e18a7aa 100644 --- a/file_io/unix/.cvsignore +++ b/file_io/unix/.cvsignore @@ -1 +1,3 @@ Makefile +*.lo +.libs diff --git a/file_io/unix/Makefile.in b/file_io/unix/Makefile.in index d437f0157..d612ce198 100644 --- a/file_io/unix/Makefile.in +++ b/file_io/unix/Makefile.in @@ -1,38 +1,22 @@ -RM=@RM@ -CC=@CC@ -RANLIB=@RANLIB@ -CFLAGS=@CFLAGS@ @OPTIM@ -LIBS=@LIBS@ -LDFLAGS=@LDFLAGS@ $(LIBS) + +TARGETS = \ + dir.lo \ + fileacc.lo \ + filedup.lo \ + filestat.lo \ + flock.lo \ + fullrw.lo \ + open.lo \ + pipe.lo \ + readwrite.lo \ + seek.lo + +# bring in rules.mk for standard functionality +@INCLUDE_RULES@ + INCDIR=../../include OSDIR=$(INCDIR)/arch/@OSDIR@ DEFOSDIR=$(INCDIR)/arch/@DEFAULT_OSDIR@ INCLUDES=-I$(INCDIR) -I$(OSDIR) -I$(DEFOSDIR) -MKDEP=../../helpers/mkdep.sh - -OBJS=dir.o \ - fileacc.o \ - filedup.o \ - filestat.o \ - flock.o \ - fullrw.o \ - open.o \ - pipe.o \ - readwrite.o \ - seek.o - -.c.o: - $(CC) $(CFLAGS) -c $(INCLUDES) $< - -all: $(OBJS) - -clean: - $(RM) -f *.o *.a *.so - -distclean: clean - -$(RM) -f Makefile - -depend: - $(MKDEP) $(INCLUDES) $(CFLAGS) *.c # DO NOT REMOVE diff --git a/helpers/.cvsignore b/helpers/.cvsignore new file mode 100644 index 000000000..62437018a --- /dev/null +++ b/helpers/.cvsignore @@ -0,0 +1,3 @@ +ltconfig +ltmain.sh +rules.mk diff --git a/helpers/apr-conf.m4 b/helpers/apr-conf.m4 index ce041ca1c..cc0110439 100644 --- a/helpers/apr-conf.m4 +++ b/helpers/apr-conf.m4 @@ -303,13 +303,6 @@ if test "$ac_cv_socklen_t" = "yes"; then fi ]) -dnl Check for ranlib but, unlike the check provided with autoconf, set -dnl RANLIB to "true" if there is no ranlib instead of setting it to ":". -dnl OS/390 doesn't have ranlib and the make utility doesn't parse "RANLIB=:" -dnl the way we might want it to. -AC_DEFUN(AC_PROG_RANLIB_NC, -[AC_CHECK_TOOL(RANLIB, ranlib, true)]) - AC_DEFUN(APR_EBCDIC,[ AC_CACHE_CHECK([whether system uses EBCDIC],ac_cv_ebcdic,[ diff --git a/helpers/rules.mk.in b/helpers/rules.mk.in new file mode 100644 index 000000000..efc8696b6 --- /dev/null +++ b/helpers/rules.mk.in @@ -0,0 +1,162 @@ +# ==================================================================== +# The Apache Software License, Version 1.1 +# +# Copyright (c) 2000 The Apache Software Foundation. All rights +# reserved. +# +# Redistribution and use in source and binary forms, with or without +# modification, are permitted provided that the following conditions +# are met: +# +# 1. Redistributions of source code must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# +# 2. Redistributions in binary form must reproduce the above copyright +# notice, this list of conditions and the following disclaimer in +# the documentation and/or other materials provided with the +# distribution. +# +# 3. The end-user documentation included with the redistribution, +# if any, must include the following acknowledgment: +# "This product includes software developed by the +# Apache Software Foundation (http://www.apache.org/)." +# Alternately, this acknowledgment may appear in the software itself, +# if and wherever such third-party acknowledgments normally appear. +# +# 4. The names "Apache" and "Apache Software Foundation" must +# not be used to endorse or promote products derived from this +# software without prior written permission. For written +# permission, please contact apache@apache.org. +# +# 5. Products derived from this software may not be called "Apache", +# nor may "Apache" appear in their name, without prior written +# permission of the Apache Software Foundation. +# +# THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED +# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES +# OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE +# DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR +# ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF +# USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND +# ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, +# OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT +# OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF +# SUCH DAMAGE. +# ==================================================================== +# +# This software consists of voluntary contributions made by many +# individuals on behalf of the Apache Software Foundation. For more +# information on the Apache Software Foundation, please see +# <http://www.apache.org/>. +# + +# +# rules.mk: standard rules for APR +# + +@SET_MAKE@ + +# +# Configuration variables +# +top_builddir=@top_builddir@ + +CC=@CC@ +AWK=@AWK@ +LIBTOOL=@LIBTOOL@ + +CFLAGS=@CFLAGS@ @OPTIM@ $(INCLUDES) +LIBS=@LIBS@ +LDFLAGS=@LDFLAGS@ + +RM=@RM@ +SHELL=@SHELL@ + +### make LTFLAGS somewhat variable? +LTFLAGS = --silent + +MKDEP=$(top_builddir)/helpers/mkdep.sh + +# +# Basic macro setup +# +COMPILE = $(CC) $(CFLAGS) +LT_COMPILE = $(LIBTOOL) --mode=compile $(LTFLAGS) $(COMPILE) -c $< && touch $@ + +LINK = $(LIBTOOL) --mode=link $(LTFLAGS) $(COMPILE) $(LDFLAGS) -o $@ + +# +# Standard build rules +# +all: all-recursive +depend: depend-recursive +clean: clean-recursive +distclean: distclean-recursive +extraclean: extraclean-recursive + +install: all-recursive + + +all-recursive depend-recursive clean-recursive distclean-recursive \ + extraclean-recursive: + @otarget=`echo $@ | sed s/-recursive//`; \ + list='$(SUBDIRS)'; \ + for i in $$list; do \ + if test -d "$$i"; then \ + target="$$otarget"; \ + echo "Making $$target in $$i"; \ + if test "$$i" = "."; then \ + made_local=yes; \ + target="local-$$target"; \ + fi; \ + (cd $$i && $(MAKE) $$target) || exit 1; \ + fi; \ + done; \ + if test "$$otarget" = "all" && test -z "$(TARGETS)"; then \ + made_local=n/a; \ + fi; \ + if test -z "$$made_local"; then \ + $(MAKE) "local-$$otarget" || exit 1; \ + fi + +local-clean: x-local-clean + $(RM) -f *.o *.lo *.a *.la *.so $(CLEAN_TARGETS) $(PROGRAMS) + $(RM) -rf .libs + +local-distclean: local-clean x-local-distclean + $(RM) -f Makefile $(DISTCLEAN_TARGETS) + +local-extraclean: local-distclean + @if test -n "$(EXTRACLEAN_TARGETS)"; then \ + echo $(RM) -f $(EXTRACLEAN_TARGETS) ; \ + $(RM) -f $(EXTRACLEAN_TARGETS) ; \ + fi + +local-all: $(TARGETS) + +local-depend: + $(MKDEP) $(INCLUDES) $(CFLAGS) *.c + +# to be filled in by the actual Makefile +x-local-clean x-local-distclean: + + +# +# Implicit rules for creating outputs from input files +# +.SUFFIXES: +.SUFFIXES: .c .lo .o + +.c.o: + $(COMPILE) -c $< + +.c.lo: + $(LT_COMPILE) + +.PHONY: all depend clean distclean extraclean install \ + all-recursive depend-recursive clean-recursive distclean-recursive \ + extraclean-recursive + local-all local-depend local-clean local-distclean local-extraclean \ + x-local-clean x-local-distclean diff --git a/i18n/unix/.cvsignore b/i18n/unix/.cvsignore index f3c7a7c5d..06e18a7aa 100644 --- a/i18n/unix/.cvsignore +++ b/i18n/unix/.cvsignore @@ -1 +1,3 @@ Makefile +*.lo +.libs diff --git a/i18n/unix/Makefile.in b/i18n/unix/Makefile.in index 0e35098c0..b04b1c301 100644 --- a/i18n/unix/Makefile.in +++ b/i18n/unix/Makefile.in @@ -1,28 +1,11 @@ -RM=@RM@ -CC=@CC@ -RANLIB=@RANLIB@ -CFLAGS=@CFLAGS@ @OPTIM@ -LIBS=@LIBS@ -LDFLAGS=@LDFLAGS@ $(LIBS) -DEFOSDIR=$(INCDIR)/arch/@DEFAULT_OSDIR@ -INCDIR=../../include -INCLUDES=-I$(INCDIR) -I$(DEFOSDIR) -MKDEP=../../helpers/mkdep.sh - -OBJS=xlate.o - -.c.o: - $(CC) $(CFLAGS) -c $(INCLUDES) $< -all: $(OBJS) +TARGETS = xlate.lo -clean: - $(RM) -f *.o *.a *.so +# bring in rules.mk for standard functionality +@INCLUDE_RULES@ -distclean: clean - -$(RM) -f Makefile - -depend: - $(MKDEP) $(INCLUDES) $(CFLAGS) *.c +DEFOSDIR=$(INCDIR)/arch/@DEFAULT_OSDIR@ +INCDIR=../../include +INCLUDES=-I$(INCDIR) -I$(DEFOSDIR) # DO NOT REMOVE diff --git a/lib/.cvsignore b/lib/.cvsignore index f3c7a7c5d..06e18a7aa 100644 --- a/lib/.cvsignore +++ b/lib/.cvsignore @@ -1 +1,3 @@ Makefile +*.lo +.libs diff --git a/lib/Makefile.in b/lib/Makefile.in index 74761502d..1169f7418 100644 --- a/lib/Makefile.in +++ b/lib/Makefile.in @@ -1,30 +1,12 @@ -CC=@CC@ -RANLIB=@RANLIB@ -AR=@AR@ -RM=@RM@ -CFLAGS=@CFLAGS@ @OPTIM@ -LIBS=@LIBS@ -LDFLAGS=@LDFLAGS@ $(LIBS) + +TARGETS = apr_pools.lo + +# bring in rules.mk for standard functionality +@INCLUDE_RULES@ + INCDIR=../include OSDIR=$(INCDIR)/arch/@OSDIR@ DEFOSDIR=$(INCDIR)/arch/@DEFAULT_OSDIR@ INCLUDES=-I$(INCDIR) -I$(OSDIR) -I$(DEFOSDIR) -MKDEP=../helpers/mkdep.sh - -OBJS=apr_pools.o - -.c.o: - $(CC) $(CFLAGS) -c $(INCLUDES) $< - -all: $(OBJS) - -clean: - $(RM) -f *.o *.a *.so - -distclean: clean - -$(RM) -f Makefile - -depend: - $(MKDEP) $(INCLUDES) $(CFLAGS) *.c # DO NOT REMOVE diff --git a/locks/beos/.cvsignore b/locks/beos/.cvsignore index f3c7a7c5d..06e18a7aa 100644 --- a/locks/beos/.cvsignore +++ b/locks/beos/.cvsignore @@ -1 +1,3 @@ Makefile +*.lo +.libs diff --git a/locks/beos/Makefile.in b/locks/beos/Makefile.in index 40afc8c69..e0a13869c 100644 --- a/locks/beos/Makefile.in +++ b/locks/beos/Makefile.in @@ -1,36 +1,13 @@ -CC=@CC@ -RANLIB=@RANLIB@ -CFLAGS=@CFLAGS@ @OPTIM@ -LIBS=@LIBS@ -LDFLAGS=@LDFLAGS@ $(LIBS) -INCDIR=../../include -INCLUDES=-I$(INCDIR) -I$(INCDIR)/arch -MKDEP=../../helpers/mkdep.sh - -LIB=liblock.a - -OBJS=locks.o \ - crossproc.o \ - intraproc.o \ - -.c.o: - $(CC) $(CFLAGS) -c $(INCLUDES) $< -all: $(LIB) +TARGETS = + locks.lo \ + crossproc.lo \ + intraproc.lo \ -clean: - $(RM) -f *.o *.a *.so +# bring in rules.mk for standard functionality +@INCLUDE_RULES@ -distclean: clean - -$(RM) -f Makefile - - -$(LIB): $(OBJS) - $(RM) -f $@ - $(AR) cr $@ $(OBJS) - $(RANLIB) $@ - -depend: - $(MKDEP) $(INCLUDES) $(CFLAGS) *.c +INCDIR=../../include +INCLUDES=-I$(INCDIR) -I$(INCDIR)/arch # DO NOT REMOVE diff --git a/locks/os2/.cvsignore b/locks/os2/.cvsignore index f3c7a7c5d..06e18a7aa 100644 --- a/locks/os2/.cvsignore +++ b/locks/os2/.cvsignore @@ -1 +1,3 @@ Makefile +*.lo +.libs diff --git a/locks/os2/Makefile.in b/locks/os2/Makefile.in index 7ecd8cf87..930928975 100644 --- a/locks/os2/Makefile.in +++ b/locks/os2/Makefile.in @@ -1,36 +1,12 @@ -CC=@CC@ -RANLIB=@RANLIB@ -CFLAGS=@CFLAGS@ @OPTIM@ -LIBS=@LIBS@ -LDFLAGS=@LDFLAGS@ $(LIBS) + +TARGETS = locks.lo + +# bring in rules.mk for standard functionality +@INCLUDE_RULES@ + INCDIR=../../include OSDIR=$(INCDIR)/arch/@OSDIR@ DEFOSDIR=$(INCDIR)/arch/@DEFAULT_OSDIR@ INCLUDES=-I$(INCDIR) -I$(OSDIR) -I$(DEFOSDIR) -MKDEP=../../helpers/mkdep.sh - -LIB=lock.a - -OBJS=locks.o - -.c.o: - $(CC) $(CFLAGS) -c $(INCLUDES) $< - -all: $(LIB) - -clean: - $(RM) -f *.o *.a *.so - -distclean: clean - -$(RM) -f Makefile - - -$(LIB): $(OBJS) - $(RM) -f $@ - $(AR) cr $@ $(OBJS) - $(RANLIB) $@ - -depend: - $(MKDEP) $(INCLUDES) $(CFLAGS) *.c # DO NOT REMOVE diff --git a/locks/unix/.cvsignore b/locks/unix/.cvsignore index f3c7a7c5d..06e18a7aa 100644 --- a/locks/unix/.cvsignore +++ b/locks/unix/.cvsignore @@ -1 +1,3 @@ Makefile +*.lo +.libs diff --git a/locks/unix/Makefile.in b/locks/unix/Makefile.in index 30530fedb..d375b3a74 100644 --- a/locks/unix/Makefile.in +++ b/locks/unix/Makefile.in @@ -1,31 +1,15 @@ -RM=@RM@ -CC=@CC@ -RANLIB=@RANLIB@ -CFLAGS=@CFLAGS@ @OPTIM@ -LIBS=@LIBS@ -LDFLAGS=@LDFLAGS@ $(LIBS) + +TARGETS = \ + locks.lo \ + crossproc.lo \ + intraproc.lo + +# bring in rules.mk for standard functionality +@INCLUDE_RULES@ + INCDIR=../../include INCDIR2=$(INCDIR)/arch INCDIR3=$(INCDIR)/arch/unix INCLUDES=-I$(INCDIR) -I$(INCDIR2) -I$(INCDIR3) -MKDEP=../../helpers/mkdep.sh - -OBJS=locks.o \ - crossproc.o \ - intraproc.o - -.c.o: - $(CC) $(CFLAGS) -c $(INCLUDES) $< - -all: $(OBJS) - -clean: - $(RM) -f *.o *.a *.so - -distclean: clean - -$(RM) -f Makefile - -depend: - $(MKDEP) $(INCLUDES) $(CFLAGS) *.c # DO NOT REMOVE diff --git a/misc/unix/.cvsignore b/misc/unix/.cvsignore index f3c7a7c5d..06e18a7aa 100644 --- a/misc/unix/.cvsignore +++ b/misc/unix/.cvsignore @@ -1 +1,3 @@ Makefile +*.lo +.libs diff --git a/misc/unix/Makefile.in b/misc/unix/Makefile.in index ec50abb0e..729af2a6f 100644 --- a/misc/unix/Makefile.in +++ b/misc/unix/Makefile.in @@ -1,30 +1,14 @@ -RM=@RM@ -CC=@CC@ -RANLIB=@RANLIB@ -CFLAGS=@CFLAGS@ @OPTIM@ -LIBS=@LIBS@ -LDFLAGS=@LDFLAGS@ $(LIBS) + +TARGETS = \ + start.lo getopt.lo otherchild.lo errorcodes.lo rand.lo \ + uuid.lo getuuid.lo + +# bring in rules.mk for standard functionality +@INCLUDE_RULES@ + INCDIR=../../include OSDIR=$(INCDIR)/arch/@OSDIR@ DEFOSDIR=$(INCDIR)/arch/@DEFAULT_OSDIR@ INCLUDES=-I$(INCDIR) -I$(OSDIR) -I$(DEFOSDIR) -MKDEP=../../helpers/mkdep.sh - -OBJS=start.o getopt.o otherchild.o errorcodes.o rand.o \ - uuid.o getuuid.o - -.c.o: - $(CC) $(CFLAGS) -c $(INCLUDES) $< - -all: $(OBJS) - -clean: - $(RM) -f *.o *.a *.so - -distclean: clean - -$(RM) -f Makefile - -depend: - $(MKDEP) $(INCLUDES) $(CFLAGS) *.c # DO NOT REMOVE diff --git a/mmap/unix/.cvsignore b/mmap/unix/.cvsignore index f3c7a7c5d..06e18a7aa 100644 --- a/mmap/unix/.cvsignore +++ b/mmap/unix/.cvsignore @@ -1 +1,3 @@ Makefile +*.lo +.libs diff --git a/mmap/unix/Makefile.in b/mmap/unix/Makefile.in index 9fc7221ba..65e880add 100644 --- a/mmap/unix/Makefile.in +++ b/mmap/unix/Makefile.in @@ -1,30 +1,11 @@ -RM=@RM@ -CC=@CC@ -RANLIB=@RANLIB@ -CFLAGS=@CFLAGS@ @OPTIM@ -LIBS=@LIBS@ -LDFLAGS=@LDFLAGS@ $(LIBS) -DEFOSDIR=$(INCDIR)/arch/@DEFAULT_OSDIR@ -INCDIR=../../include -INCLUDES=-I$(INCDIR) -I$(DEFOSDIR) -MKDEP=../../helpers/mkdep.sh - -LIB=libmmap.a - -OBJS=mmap.o common.o -.c.o: - $(CC) $(CFLAGS) -c $(INCLUDES) $< +TARGETS = mmap.lo common.lo -all: $(OBJS) +# bring in rules.mk for standard functionality +@INCLUDE_RULES@ -clean: - $(RM) -f *.o *.a *.so - -distclean: clean - -$(RM) -f Makefile - -depend: - $(MKDEP) $(INCLUDES) $(CFLAGS) *.c +DEFOSDIR=$(INCDIR)/arch/@DEFAULT_OSDIR@ +INCDIR=../../include +INCLUDES=-I$(INCDIR) -I$(DEFOSDIR) # DO NOT REMOVE diff --git a/network_io/beos/.cvsignore b/network_io/beos/.cvsignore index f3c7a7c5d..06e18a7aa 100644 --- a/network_io/beos/.cvsignore +++ b/network_io/beos/.cvsignore @@ -1 +1,3 @@ Makefile +*.lo +.libs diff --git a/network_io/beos/Makefile.in b/network_io/beos/Makefile.in index f7477ef66..1c767812f 100644 --- a/network_io/beos/Makefile.in +++ b/network_io/beos/Makefile.in @@ -1,38 +1,12 @@ -CC=@CC@ -RANLIB=@RANLIB@ -CFLAGS=@CFLAGS@ @OPTIM@ -LIBS=@LIBS@ -LDFLAGS=@LDFLAGS@ $(LIBS) + +TARGETS = poll.lo sendrecv.lo socketcommon.lo + +# bring in rules.mk for standard functionality +@INCLUDE_RULES@ + INCDIR=../../include OSDIR=$(INCDIR)/arch/@OSDIR@ DEFOSDIR=$(INCDIR)/arch/@DEFAULT_OSDIR@ INCLUDES=-I$(INCDIR) -I$(OSDIR) -I$(DEFOSDIR) -MKDEP=../../helpers/mkdep.sh - -LIB=libnetwork.a - -OBJS=poll.o \ - sendrecv.o \ - socketcommon.o - -.c.o: - $(CC) $(CFLAGS) -c $(INCLUDES) $< - -all: $(LIB) - -clean: - $(RM) -f *.o *.a *.so - -distclean: clean - -$(RM) -f Makefile - - -$(LIB): $(OBJS) - $(RM) -f $@ - $(AR) cr $@ $(OBJS) - $(RANLIB) $@ - -depend: - $(MKDEP) $(INCLUDES) $(CFLAGS) *.c # DO NOT REMOVE diff --git a/network_io/os2/.cvsignore b/network_io/os2/.cvsignore index f3c7a7c5d..06e18a7aa 100644 --- a/network_io/os2/.cvsignore +++ b/network_io/os2/.cvsignore @@ -1 +1,3 @@ Makefile +*.lo +.libs diff --git a/network_io/os2/Makefile.in b/network_io/os2/Makefile.in index e5077ea8a..543a36e15 100644 --- a/network_io/os2/Makefile.in +++ b/network_io/os2/Makefile.in @@ -1,43 +1,20 @@ -CC=@CC@ -RANLIB=@RANLIB@ -CFLAGS=@CFLAGS@ @OPTIM@ -LIBS=@LIBS@ -LDFLAGS=@LDFLAGS@ $(LIBS) + +TARGETS = \ + poll.lo \ + sendrecv.lo \ + sockets.lo \ + sockopt.lo \ + sockaddr.lo \ + inet_ntop.lo \ + inet_pton.lo \ + os2calls.lo + +# bring in rules.mk for standard functionality +@INCLUDE_RULES@ + INCDIR=../../include OSDIR=$(INCDIR)/arch/@OSDIR@ DEFOSDIR=$(INCDIR)/arch/@DEFAULT_OSDIR@ INCLUDES=-I$(INCDIR) -I$(OSDIR) -I$(DEFOSDIR) -MKDEP=../../helpers/mkdep.sh - -LIB=network.a - -OBJS=poll.o \ - sendrecv.o \ - sockets.o \ - sockopt.o \ - sockaddr.o \ - inet_ntop.o \ - inet_pton.o \ - os2calls.o - -.c.o: - $(CC) $(CFLAGS) -c $(INCLUDES) $< - -all: $(LIB) - -clean: - $(RM) -f *.o *.a *.so - -distclean: clean - -$(RM) -f Makefile - - -$(LIB): $(OBJS) - $(RM) -f $@ - $(AR) cr $@ $(OBJS) - $(RANLIB) $@ - -depend: - $(MKDEP) $(INCLUDES) $(CFLAGS) *.c # DO NOT REMOVE diff --git a/network_io/unix/.cvsignore b/network_io/unix/.cvsignore index f3c7a7c5d..06e18a7aa 100644 --- a/network_io/unix/.cvsignore +++ b/network_io/unix/.cvsignore @@ -1 +1,3 @@ Makefile +*.lo +.libs diff --git a/network_io/unix/Makefile.in b/network_io/unix/Makefile.in index 219f25bf7..07511f270 100644 --- a/network_io/unix/Makefile.in +++ b/network_io/unix/Makefile.in @@ -1,37 +1,19 @@ -RM=@RM@ -CC=@CC@ -RANLIB=@RANLIB@ -CFLAGS=@CFLAGS@ @OPTIM@ -LIBS=@LIBS@ -LDFLAGS=@LDFLAGS@ $(LIBS) + +TARGETS = \ + poll.lo \ + sendrecv.lo \ + sockets.lo \ + sockopt.lo \ + sockaddr.lo \ + inet_ntop.lo \ + inet_pton.lo + +# bring in rules.mk for standard functionality +@INCLUDE_RULES@ + INCDIR=../../include OSDIR=$(INCDIR)/arch/@OSDIR@ DEFOSDIR=$(INCDIR)/arch/@DEFAULT_OSDIR@ INCLUDES=-I$(INCDIR) -I$(OSDIR) -I$(DEFOSDIR) -MKDEP=../../helpers/mkdep.sh - -LIB=libnetwork.a - -OBJS=poll.o \ - sendrecv.o \ - sockets.o \ - sockopt.o \ - sockaddr.o \ - inet_ntop.o \ - inet_pton.o - -.c.o: - $(CC) $(CFLAGS) -c $(INCLUDES) $< - -all: $(OBJS) - -clean: - $(RM) -f *.o *.a *.so - -distclean: clean - -$(RM) -f Makefile - -depend: - $(MKDEP) $(INCLUDES) $(CFLAGS) *.c # DO NOT REMOVE diff --git a/passwd/.cvsignore b/passwd/.cvsignore index f3c7a7c5d..06e18a7aa 100644 --- a/passwd/.cvsignore +++ b/passwd/.cvsignore @@ -1 +1,3 @@ Makefile +*.lo +.libs diff --git a/passwd/Makefile.in b/passwd/Makefile.in index b4c08ad47..4104f39ab 100644 --- a/passwd/Makefile.in +++ b/passwd/Makefile.in @@ -1,30 +1,11 @@ -CC=@CC@ -RANLIB=@RANLIB@ -AR=@AR@ -RM=@RM@ -CFLAGS=@CFLAGS@ @OPTIM@ -LIBS=@LIBS@ -LDFLAGS=@LDFLAGS@ $(LIBS) -INCDIR=../include -DEFOSDIR=$(INCDIR)/arch/@DEFAULT_OSDIR@ -INCLUDES=-I$(INCDIR) -I$(DEFOSDIR) -MKDEP=../helpers/mkdep.sh - -OBJS=apr_md5.o \ - apr_getpass.o - -.c.o: - $(CC) $(CFLAGS) -c $(INCLUDES) $< -all: $(OBJS) +TARGETS = apr_md5.lo apr_getpass.lo -clean: - $(RM) -f *.o *.a *.so +# bring in rules.mk for standard functionality +@INCLUDE_RULES@ -distclean: clean - -$(RM) -f Makefile - -depend: - $(MKDEP) $(INCLUDES) $(CFLAGS) *.c +INCDIR=../include +DEFOSDIR=$(INCDIR)/arch/@DEFAULT_OSDIR@ +INCLUDES=-I$(INCDIR) -I$(DEFOSDIR) # DO NOT REMOVE diff --git a/shmem/os2/.cvsignore b/shmem/os2/.cvsignore index f3c7a7c5d..06e18a7aa 100644 --- a/shmem/os2/.cvsignore +++ b/shmem/os2/.cvsignore @@ -1 +1,3 @@ Makefile +*.lo +.libs diff --git a/shmem/os2/Makefile.in b/shmem/os2/Makefile.in index 06e2dfdee..2c8d43640 100644 --- a/shmem/os2/Makefile.in +++ b/shmem/os2/Makefile.in @@ -1,36 +1,12 @@ -CC=@CC@ -RANLIB=@RANLIB@ -CFLAGS=@CFLAGS@ @OPTIM@ -LIBS=@LIBS@ -LDFLAGS=@LDFLAGS@ $(LIBS) + +TARGETS = shmem.lo + +# bring in rules.mk for standard functionality +@INCLUDE_RULES@ + INCDIR=../../include OSDIR=$(INCDIR)/arch/@OSDIR@ DEFOSDIR=$(INCDIR)/arch/@DEFAULT_OSDIR@ INCLUDES=-I$(INCDIR) -I$(OSDIR) -I$(DEFOSDIR) -MKDEP=../../helpers/mkdep.sh - -LIB=shmem.a - -OBJS=shmem.o - -.c.o: - $(CC) $(CFLAGS) -c $(INCLUDES) $< - -all: $(LIB) - -clean: - $(RM) -f *.o *.a *.so - -distclean: clean - -$(RM) -f Makefile - - -$(LIB): $(OBJS) - $(RM) -f $@ - $(AR) cr $@ $(OBJS) - $(RANLIB) $@ - -depend: - $(MKDEP) $(INCLUDES) $(CFLAGS) *.c # DO NOT REMOVE diff --git a/shmem/unix/.cvsignore b/shmem/unix/.cvsignore index f3c7a7c5d..06e18a7aa 100644 --- a/shmem/unix/.cvsignore +++ b/shmem/unix/.cvsignore @@ -1 +1,3 @@ Makefile +*.lo +.libs diff --git a/shmem/unix/Makefile.in b/shmem/unix/Makefile.in index 18c95cd96..970591b2e 100644 --- a/shmem/unix/Makefile.in +++ b/shmem/unix/Makefile.in @@ -1,41 +1,27 @@ -RM=@RM@ -CC=@CC@ -AR=@AR@ -RANLIB=@RANLIB@ -CFLAGS=@CFLAGS@ @OPTIM@ -LIBS=@LIBS@ -LDFLAGS=@LDFLAGS@ $(LIBS) -INCDIR=../../include -INCDIR1=mm -INCLUDES=-I$(INCDIR) -I$(INCDIR1) -MKDEP=../../helpers/mkdep.sh - -LIB=libshmem.a -OBJS=shmem.o +TARGETS = shmem.lo build-mm -.c.o: - $(CC) $(CFLAGS) -c $(INCLUDES) $< +# bring in rules.mk for standard functionality +@INCLUDE_RULES@ -all: $(LIB) +INCDIR=../../include +INCDIR1=mm +INCLUDES=-I$(INCDIR) -I$(INCDIR1) -clean: - $(RM) -f *.o *.a *.so +x-local-clean: (cd mm && $(MAKE) clean) -distclean: clean - -$(RM) -f Makefile +x-local-distclean: (cd mm && $(MAKE) distclean) +# build the MM library, then copy the objects to this dir so our top-level +# will find them and copy them to the (top)/objs directory +MM_OBJS = \ + mm/mm_global.lo mm/mm_alloc.lo mm/mm_core.lo mm/mm_lib.lo \ + mm/mm_vers.lo -$(LIB): $(OBJS) - $(RM) -f $@ +build-mm: (cd mm && $(MAKE) libmm.la) - cp mm/mm_global.o mm/mm_alloc.o mm/mm_core.o mm/mm_lib.o mm/mm_vers.o . - $(AR) cr $@ $(OBJS) - $(RANLIB) $@ - -depend: - $(MKDEP) $(INCLUDES) $(CFLAGS) *.c + cp $(MM_OBJS) . # DO NOT REMOVE diff --git a/strings/.cvsignore b/strings/.cvsignore index f3c7a7c5d..06e18a7aa 100644 --- a/strings/.cvsignore +++ b/strings/.cvsignore @@ -1 +1,3 @@ Makefile +*.lo +.libs diff --git a/strings/Makefile.in b/strings/Makefile.in index 2c10f2c23..2c1425c5e 100644 --- a/strings/Makefile.in +++ b/strings/Makefile.in @@ -1,33 +1,16 @@ -CC=@CC@ -RANLIB=@RANLIB@ -AR=@AR@ -RM=@RM@ -CFLAGS=@CFLAGS@ @OPTIM@ -LIBS=@LIBS@ -LDFLAGS=@LDFLAGS@ $(LIBS) -DEFOSDIR=$(INCDIR)/arch/@DEFAULT_OSDIR@ -INCDIR=../include -INCLUDES=-I$(INCDIR) -I$(DEFOSDIR) -MKDEP=../helpers/mkdep.sh - -OBJS=apr_cpystrn.o \ - apr_snprintf.o \ - apr_strnatcmp.o \ - apr_strings.o \ - apr_fnmatch.o - -.c.o: - $(CC) $(CFLAGS) -c $(INCLUDES) $< -all: $(OBJS) +TARGETS = \ + apr_cpystrn.lo \ + apr_snprintf.lo \ + apr_strnatcmp.lo \ + apr_strings.lo \ + apr_fnmatch.lo -clean: - $(RM) -f *.o *.a *.so +# bring in rules.mk for standard functionality +@INCLUDE_RULES@ -distclean: clean - -$(RM) -f Makefile - -depend: - $(MKDEP) $(INCLUDES) $(CFLAGS) *.c +DEFOSDIR=$(INCDIR)/arch/@DEFAULT_OSDIR@ +INCDIR=../include +INCLUDES=-I$(INCDIR) -I$(DEFOSDIR) # DO NOT REMOVE diff --git a/tables/.cvsignore b/tables/.cvsignore index f3c7a7c5d..06e18a7aa 100644 --- a/tables/.cvsignore +++ b/tables/.cvsignore @@ -1 +1,3 @@ Makefile +*.lo +.libs diff --git a/tables/Makefile.in b/tables/Makefile.in index 05aa28c76..3fd280bbf 100644 --- a/tables/Makefile.in +++ b/tables/Makefile.in @@ -1,30 +1,11 @@ -CC=@CC@ -RANLIB=@RANLIB@ -AR=@AR@ -RM=@RM@ -CFLAGS=@CFLAGS@ @OPTIM@ -LIBS=@LIBS@ -LDFLAGS=@LDFLAGS@ $(LIBS) -DEFOSDIR=$(INCDIR)/arch/@DEFAULT_OSDIR@ -INCDIR=../include -INCLUDES=-I$(INCDIR) -I$(DEFOSDIR) -MKDEP=../helpers/mkdep.sh - -OBJS=apr_tables.o \ - apr_hash.o - -.c.o: - $(CC) $(CFLAGS) -c $(INCLUDES) $< -all: $(OBJS) +TARGETS = apr_tables.lo apr_hash.lo -clean: - $(RM) -f *.o *.a *.so +# bring in rules.mk for standard functionality +@INCLUDE_RULES@ -distclean: clean - -$(RM) -f Makefile - -depend: - $(MKDEP) $(INCLUDES) $(CFLAGS) *.c +DEFOSDIR=$(INCDIR)/arch/@DEFAULT_OSDIR@ +INCDIR=../include +INCLUDES=-I$(INCDIR) -I$(DEFOSDIR) # DO NOT REMOVE diff --git a/test/.cvsignore b/test/.cvsignore index d2927e241..ba64b9c08 100644 --- a/test/.cvsignore +++ b/test/.cvsignore @@ -1,4 +1,6 @@ Makefile +*.lo +.libs testmd5 testmmap htdigest @@ -23,6 +25,5 @@ testuuid testsuite testsuite.opt testsuite.ncb -testflock.tmp testfile.tmp testflock diff --git a/test/Makefile.in b/test/Makefile.in index 7e4a52b35..35953313c 100644 --- a/test/Makefile.in +++ b/test/Makefile.in @@ -1,15 +1,6 @@ -RM=@RM@ -CC=@CC@ -RANLIB=@RANLIB@ -CFLAGS=-g @CFLAGS@ @OPTIM@ -LIBS=../libapr.a @LIBS@ -LDFLAGS=@LDFLAGS@ $(LIBS) -INCDIR=../include -INCLUDES=-I$(INCDIR) -MKDEP=../helpers/mkdep.sh -SO_LDFLAG=@SO_LDFLAG@ -TARGETS= client@EXEEXT@ \ +TARGETS = \ + client@EXEEXT@ \ sendfile@EXEEXT@ \ server@EXEEXT@ \ testfile@EXEEXT@ \ @@ -29,90 +20,75 @@ TARGETS= client@EXEEXT@ \ occhild.so \ mod_test.so -OBJS= testfile.o \ - testflock.o \ - testproc.o \ - testsock.o \ - testthread.o \ - testtime.o \ - testargs.o \ - testcontext.o \ - testmmap.o \ - testdso.o \ - testoc.o \ - testuuid.o \ - occhild.o \ - mod_test.o +LIBS=../libapr.a @LIBS@ -.c.o: - $(CC) -c $(CFLAGS) $(INCLUDES) $< +# bring in rules.mk for standard functionality +@INCLUDE_RULES@ -all: $(TARGETS) +CLEAN_TARGETS = testfile.tmp -testfile@EXEEXT@: testfile.o - $(CC) $(CFLAGS) -o testfile@EXEEXT@ testfile.o $(LDFLAGS) +CFLAGS = -g @CFLAGS@ @OPTIM@ -testflock@EXEEXT@: testflock.o - $(CC) $(CFLAGS) -o testflock@EXEEXT@ testflock.o $(LDFLAGS) +INCDIR=../include +INCLUDES=-I$(INCDIR) -testdso@EXEEXT@: testdso.o - $(CC) $(CFLAGS) --export-dynamic -fPIC testdso.o -o testdso@EXEEXT@ $(LDFLAGS) -testoc@EXEEXT@: testoc.o - $(CC) $(CFLAGS) -o testoc@EXEEXT@ testoc.o $(LDFLAGS) +testfile@EXEEXT@: testfile.lo + $(LINK) testfile.lo -occhild.so: occhild.o - $(CC) $(SO_LDFLAG) occhild.o -o occhild.so +testflock@EXEEXT@: testflock.lo + $(LINK) testflock.lo -mod_test.so: mod_test.o - $(CC) $(SO_LDFLAG) mod_test.o -o mod_test.so +### why the export-dynamic? +testdso@EXEEXT@: testdso.lo + $(LINK) --export-dynamic testdso.lo -testargs@EXEEXT@: testargs.o - $(CC) $(CFLAGS) -o testargs@EXEEXT@ testargs.o $(LDFLAGS) +testoc@EXEEXT@: testoc.lo + $(LINK) testoc.lo -testcontext@EXEEXT@: testcontext.o - $(CC) $(CFLAGS) -o testcontext@EXEEXT@ testcontext.o $(LDFLAGS) +occhild.so: occhild.lo + $(LINK) --module occhild.lo -testproc@EXEEXT@: testproc.o - $(CC) $(CFLAGS) -o testproc@EXEEXT@ testproc.o $(LDFLAGS) +mod_test.so: mod_test.lo + $(LINK) --module mod_test.lo -testthread@EXEEXT@: testthread.o - $(CC) $(CFLAGS) -o testthread@EXEEXT@ testthread.o $(LDFLAGS) +testargs@EXEEXT@: testargs.lo + $(LINK) testargs.lo -testsock@EXEEXT@: testsock.o client@EXEEXT@ server@EXEEXT@ sendfile@EXEEXT@ - $(CC) $(CFLAGS) -o testsock@EXEEXT@ testsock.o $(LDFLAGS) +testcontext@EXEEXT@: testcontext.lo + $(LINK) testcontext.lo -client@EXEEXT@: client.o - $(CC) $(CFLAGS) -o client@EXEEXT@ client.o $(LDFLAGS) +testproc@EXEEXT@: testproc.lo + $(LINK) testproc.lo -server@EXEEXT@: server.o sendfile.o - $(CC) $(CFLAGS) -o server@EXEEXT@ server.o $(LDFLAGS) +testthread@EXEEXT@: testthread.lo + $(LINK) testthread.lo -sendfile@EXEEXT@: sendfile.o - $(CC) $(CFLAGS) -o sendfile@EXEEXT@ sendfile.o $(LDFLAGS) +testsock@EXEEXT@: testsock.lo client@EXEEXT@ server@EXEEXT@ sendfile@EXEEXT@ + $(LINK) testsock.lo -testtime@EXEEXT@: testtime.o - $(CC) $(CFLAGS) -o testtime@EXEEXT@ testtime.o $(LDFLAGS) +client@EXEEXT@: client.lo + $(LINK) client.lo -testmmap@EXEEXT@: testmmap.o - $(CC) $(CFLAGS) -o testmmap@EXEEXT@ testmmap.o $(LDFLAGS) +server@EXEEXT@: server.lo sendfile.lo + $(LINK) server.lo -testshmem@EXEEXT@: testshmem.o - $(CC) $(CFLAGS) -o testshmem@EXEEXT@ testshmem.o $(LDFLAGS) +sendfile@EXEEXT@: sendfile.lo + $(LINK) sendfile.lo -testpipe@EXEEXT@: testpipe.o - $(CC) $(CFLAGS) -o testpipe@EXEEXT@ testpipe.o $(LDFLAGS) +testtime@EXEEXT@: testtime.lo + $(LINK) testtime.lo -testuuid@EXEEXT@: testuuid.o - $(CC) $(CFLAGS) -o testuuid@EXEEXT@ testuuid.o $(LDFLAGS) +testmmap@EXEEXT@: testmmap.lo + $(LINK) testmmap.lo -clean: - $(RM) -f *.o *.a $(TARGETS) testflock.tmp +testshmem@EXEEXT@: testshmem.lo + $(LINK) testshmem.lo -distclean: clean - -$(RM) -f Makefile +testpipe@EXEEXT@: testpipe.lo + $(LINK) testpipe.lo -depend: - $(MKDEP) $(INCLUDES) $(CFLAGS) *.c +testuuid@EXEEXT@: testuuid.lo + $(LINK) testuuid.lo # DO NOT REMOVE diff --git a/threadproc/beos/.cvsignore b/threadproc/beos/.cvsignore index caadabea8..3bc2847e3 100644 --- a/threadproc/beos/.cvsignore +++ b/threadproc/beos/.cvsignore @@ -1,2 +1,4 @@ Makefile apr_proc_stub +*.lo +.libs diff --git a/threadproc/beos/Makefile.in b/threadproc/beos/Makefile.in index 0d63b7794..07b1c8904 100644 --- a/threadproc/beos/Makefile.in +++ b/threadproc/beos/Makefile.in @@ -1,44 +1,23 @@ -CC=@CC@ -RANLIB=@RANLIB@ -CFLAGS=@CFLAGS@ @OPTIM@ -LIBS=@LIBS@ -LDFLAGS=@LDFLAGS@ $(LIBS) + +TARGETS = \ + proc.lo \ + thread.lo \ + threadpriv.lo \ + threadproc_common.lo \ + apr_proc_stub + +# bring in rules.mk for standard functionality +@INCLUDE_RULES@ + INCDIR=../../include OSDIR=$(INCDIR)/arch/@OSDIR@ DEFOSDIR=$(INCDIR)/arch/@DEFAULT_OSDIR@ INCLUDES=-I$(INCDIR) -I$(INCDIR)/arch -I$(OSDIR) -I$(DEFOSDIR) -MKDEP=../../helpers/mkdep.sh - -LIB=libthreadproc.a - -OBJS=proc.o \ - thread.o \ - threadpriv.o \ - threadproc_common.o \ - apr_proc_stub -.c.o: - $(CC) $(CFLAGS) -c $(INCLUDES) $< - -all: $(LIB) +CLEAN_TARGETS = apr_proc_stub /boot/home/config/bin/apr_proc_stub apr_proc_stub: $(CC) apr_proc_stub.c \ && cp apr_proc_stub /boot/home/config/bin -clean: - $(RM) -f *.o *.a *.so /boot/home/config/bin/apr_proc_stub apr_proc_stub - -distclean: clean - -$(RM) -f Makefile - - -$(LIB): $(OBJS) - $(RM) -f $@ - $(AR) cr $@ $(OBJS) - $(RANLIB) $@ - -depend: - $(MKDEP) $(INCLUDES) $(CFLAGS) *.c - # DO NOT REMOVE diff --git a/threadproc/os2/.cvsignore b/threadproc/os2/.cvsignore index f3c7a7c5d..06e18a7aa 100644 --- a/threadproc/os2/.cvsignore +++ b/threadproc/os2/.cvsignore @@ -1 +1,3 @@ Makefile +*.lo +.libs diff --git a/threadproc/os2/Makefile.in b/threadproc/os2/Makefile.in index fc07cacd4..9a09fad8b 100644 --- a/threadproc/os2/Makefile.in +++ b/threadproc/os2/Makefile.in @@ -1,39 +1,16 @@ -CC=@CC@ -RANLIB=@RANLIB@ -CFLAGS=@CFLAGS@ @OPTIM@ -LIBS=@LIBS@ -LDFLAGS=@LDFLAGS@ $(LIBS) + +TARGETS = \ + proc.lo \ + thread.lo \ + threadpriv.lo \ + signals.lo + +# bring in rules.mk for standard functionality +@INCLUDE_RULES@ + INCDIR=../../include OSDIR=$(INCDIR)/arch/@OSDIR@ DEFOSDIR=$(INCDIR)/arch/@DEFAULT_OSDIR@ INCLUDES=-I$(INCDIR) -I$(OSDIR) -I$(DEFOSDIR) -MKDEP=../../helpers/mkdep.sh - -LIB=threadproc.a - -OBJS=proc.o \ - thread.o \ - threadpriv.o \ - signals.o - -.c.o: - $(CC) $(CFLAGS) -c $(INCLUDES) $< - -all: $(LIB) - -clean: - $(RM) -f *.o *.a *.so - -distclean: clean - -$(RM) -f Makefile - - -$(LIB): $(OBJS) - $(RM) -f $@ - $(AR) cr $@ $(OBJS) - $(RANLIB) $@ - -depend: - $(MKDEP) $(INCLUDES) $(CFLAGS) *.c # DO NOT REMOVE diff --git a/threadproc/unix/.cvsignore b/threadproc/unix/.cvsignore index f3c7a7c5d..06e18a7aa 100644 --- a/threadproc/unix/.cvsignore +++ b/threadproc/unix/.cvsignore @@ -1 +1,3 @@ Makefile +*.lo +.libs diff --git a/threadproc/unix/Makefile.in b/threadproc/unix/Makefile.in index ea97d6c3c..af1ab6ae5 100644 --- a/threadproc/unix/Makefile.in +++ b/threadproc/unix/Makefile.in @@ -1,34 +1,16 @@ -RM=@RM@ -CC=@CC@ -RANLIB=@RANLIB@ -CFLAGS=@CFLAGS@ @OPTIM@ -LIBS=@LIBS@ -LDFLAGS=@LDFLAGS@ $(LIBS) -INCDIR=../../include -DEFOSDIR=$(INCDIR)/arch/@DEFAULT_OSDIR@ -INCLUDES=-I$(INCDIR) -I$(DEFOSDIR) -MKDEP=../../helpers/mkdep.sh - -LIB=libthreadproc.a - -OBJS=proc.o \ - procsup.o \ - thread.o \ - threadpriv.o \ - signals.o -.c.o: - $(CC) $(CFLAGS) -c $(INCLUDES) $< +TARGETS = \ + proc.lo \ + procsup.lo \ + thread.lo \ + threadpriv.lo \ + signals.lo -all: $(OBJS) +# bring in rules.mk for standard functionality +@INCLUDE_RULES@ -clean: - $(RM) -f *.o *.a *.so - -distclean: clean - -$(RM) -f Makefile - -depend: - $(MKDEP) $(INCLUDES) $(CFLAGS) *.c +INCDIR=../../include +DEFOSDIR=$(INCDIR)/arch/@DEFAULT_OSDIR@ +INCLUDES=-I$(INCDIR) -I$(DEFOSDIR) # DO NOT REMOVE diff --git a/time/unix/.cvsignore b/time/unix/.cvsignore index f3c7a7c5d..06e18a7aa 100644 --- a/time/unix/.cvsignore +++ b/time/unix/.cvsignore @@ -1 +1,3 @@ Makefile +*.lo +.libs diff --git a/time/unix/Makefile.in b/time/unix/Makefile.in index b3134bc9f..18ee86e4a 100644 --- a/time/unix/Makefile.in +++ b/time/unix/Makefile.in @@ -1,29 +1,11 @@ -RM=@RM@ -CC=@CC@ -RANLIB=@RANLIB@ -CFLAGS=@CFLAGS@ @OPTIM@ -LIBS=@LIBS@ -LDFLAGS=@LDFLAGS@ $(LIBS) -DEFOSDIR=$(INCDIR)/arch/@DEFAULT_OSDIR@ -INCDIR=../../include -INCLUDES=-I$(INCDIR) -I$(DEFOSDIR) -MKDEP=../../helpers/mkdep.sh - -OBJS=time.o \ - timestr.o - -.c.o: - $(CC) $(CFLAGS) -c $(INCLUDES) $< -all: $(OBJS) +TARGETS = time.lo timestr.lo -clean: - $(RM) -f *.o *.a *.so +# bring in rules.mk for standard functionality +@INCLUDE_RULES@ -distclean: clean - -$(RM) -f Makefile - -depend: - $(MKDEP) $(INCLUDES) $(CFLAGS) *.c +DEFOSDIR=$(INCDIR)/arch/@DEFAULT_OSDIR@ +INCDIR=../../include +INCLUDES=-I$(INCDIR) -I$(DEFOSDIR) # DO NOT REMOVE diff --git a/user/unix/.cvsignore b/user/unix/.cvsignore index f3c7a7c5d..06e18a7aa 100644 --- a/user/unix/.cvsignore +++ b/user/unix/.cvsignore @@ -1 +1,3 @@ Makefile +*.lo +.libs diff --git a/user/unix/Makefile.in b/user/unix/Makefile.in index 22642134b..300adbdab 100644 --- a/user/unix/Makefile.in +++ b/user/unix/Makefile.in @@ -1,28 +1,11 @@ -RM=@RM@ -CC=@CC@ -RANLIB=@RANLIB@ -CFLAGS=@CFLAGS@ @OPTIM@ -LIBS=@LIBS@ -LDFLAGS=@LDFLAGS@ $(LIBS) -INCDIR=../../include -DEFOSDIR=$(INCDIR)/arch/@DEFAULT_OSDIR@ -INCLUDES=-I$(INCDIR) -I$(DEFOSDIR) -MKDEP=../../helpers/mkdep.sh - -OBJS=homedir.o - -.c.o: - $(CC) $(CFLAGS) -c $(INCLUDES) $< -all: $(OBJS) +TARGETS = homedir.lo -clean: - $(RM) -f *.o *.a *.so +# bring in rules.mk for standard functionality +@INCLUDE_RULES@ -distclean: clean - -$(RM) -f Makefile - -depend: - $(MKDEP) $(INCLUDES) $(CFLAGS) *.c +INCDIR=../../include +DEFOSDIR=$(INCDIR)/arch/@DEFAULT_OSDIR@ +INCLUDES=-I$(INCDIR) -I$(DEFOSDIR) # DO NOT REMOVE |