diff options
41 files changed, 178 insertions, 647 deletions
diff --git a/.cvsignore b/.cvsignore index 22ffbe43b..845f11c8b 100644 --- a/.cvsignore +++ b/.cvsignore @@ -32,3 +32,4 @@ BuildLog.htm *.vcproj autom4te.cache ltcf-c.sh +build-outputs.mk diff --git a/Makefile.in b/Makefile.in index 0b55c5e03..148402d21 100644 --- a/Makefile.in +++ b/Makefile.in @@ -10,14 +10,14 @@ APR_MAJOR_VERSION=@APR_MAJOR_VERSION@ # Macros for supporting directories # INCDIR=./include -INCDIR1=../include -INCLUDES=-I$(INCDIR) -I$(INCDIR1) +OSDIR=$(INCDIR)/arch/@OSDIR@ +DEFOSDIR=$(INCDIR)/arch/@DEFAULT_OSDIR@ +INCLUDES=-I$(INCDIR) -I$(OSDIR) -I$(DEFOSDIR) # # Macros for target determination # -SUBDIRS=@SUBDIRS@ -CLEAN_SUBDIRS= . test build +CLEAN_SUBDIRS= test INSTALL_SUBDIRS=@INSTALL_SUBDIRS@ TARGET_LIB = lib@APR_LIBNAME@.la @@ -26,16 +26,18 @@ TARGET_LIB = lib@APR_LIBNAME@.la # Rules for building specific targets, starting with 'all' for # building the entire package. # -TARGETS = delete-lib $(TARGET_LIB) delete-exports export_vars.h apr.exp +TARGETS = $(TARGET_LIB) export_vars.h apr.exp # bring in rules.mk for standard functionality @INCLUDE_RULES@ +@INCLUDE_OUTPUTS@ CLEAN_TARGETS = apr-config.out apr.exp exports.c export_vars.h DISTCLEAN_TARGETS = config.cache config.log config.status \ include/apr.h include/arch/unix/apr_private.h \ - libtool apr-config -EXTRACLEAN_TARGETS = configure aclocal.m4 include/arch/unix/apr_private.h.in + libtool apr-config build/apr_rules.mk +EXTRACLEAN_TARGETS = configure aclocal.m4 include/arch/unix/apr_private.h.in \ + build-outputs.mk build/ltcf-c.sh build/ltmain.sh build/libtool.m4 prefix=@prefix@ exec_prefix=@exec_prefix@ @@ -48,17 +50,6 @@ VPATH=@srcdir@ top_srcdir=@apr_srcdir@ top_blddir=@apr_builddir@ -EXPORT_FILES = $(top_srcdir)/include/*.h - -delete-lib: - @if test -f $(TARGET_LIB); then \ - for i in $(SUBDIRS); do objects="$$objects $$i/*.@so_ext@"; done ; \ - if test -n "`find $$objects -newer $(TARGET_LIB)`"; then \ - echo Found newer objects. Will relink $(TARGET_LIB). ; \ - echo $(RM) -f $(TARGET_LIB) ; \ - $(RM) -f $(TARGET_LIB) ; \ - fi \ - fi # Create apr-config script suitable for the install tree apr-config.out: apr-config @@ -102,27 +93,14 @@ install: $(TARGET_LIB) apr-config.out done \ fi -$(TARGET_LIB): - @for i in $(SUBDIRS); do objects="$$objects $$i/*.@so_ext@"; done ; \ - tmpcmd="$(LINK) @lib_target@ $(ALL_LIBS)"; \ - echo $$tmpcmd; \ - $$tmpcmd && touch $@ - -delete-exports: - @if test -f apr.exp; then \ - headers="`find include/*.h -newer apr.exp`" ; \ - if test -n "$$headers"; then \ - echo Found newer headers. Will rebuild apr.exp. ; \ - echo $(RM) -f apr.exp exports.c export_vars.h ; \ - $(RM) -f apr.exp exports.c export_vars.h ; \ - fi \ - fi +$(TARGET_LIB): $(OBJECTS) + $(LINK) @lib_target@ $(ALL_LIBS) -exports.c: - $(AWK) -f $(top_srcdir)/build/make_exports.awk $(EXPORT_FILES) > $@ +exports.c: $(HEADERS) + $(AWK) -f $(top_srcdir)/build/make_exports.awk $^ > $@ -export_vars.h: - $(AWK) -f $(top_srcdir)/build/make_var_export.awk $(EXPORT_FILES) > $@ +export_vars.h: $(HEADERS) + $(AWK) -f $(top_srcdir)/build/make_var_export.awk $^ > $@ apr.exp: exports.c export_vars.h @echo "#! lib@APR_LIBNAME@.so" > $@ @@ -142,6 +120,3 @@ etags: # DO NOT REMOVE docs: $(INCDIR)/*.h - -.PHONY: delete-lib delete-exports -.NOTPARALLEL: delete-lib delete-exports diff --git a/atomic/os390/Makefile.in b/atomic/os390/Makefile.in deleted file mode 100644 index 28cc1b6d8..000000000 --- a/atomic/os390/Makefile.in +++ /dev/null @@ -1,14 +0,0 @@ -srcdir = @srcdir@ -VPATH = @srcdir@ - -TARGETS = atomic.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) - -# DO NOT REMOVE diff --git a/atomic/unix/Makefile.in b/atomic/unix/Makefile.in deleted file mode 100644 index 188d0d242..000000000 --- a/atomic/unix/Makefile.in +++ /dev/null @@ -1,13 +0,0 @@ -srcdir = @srcdir@ -VPATH = @srcdir@ - -TARGETS = apr_atomic.lo - -# bring in rules.mk for standard functionality -@INCLUDE_RULES@ - -DEFOSDIR=$(INCDIR)/arch/@DEFAULT_OSDIR@ -INCDIR=../../include -INCLUDES=-I$(INCDIR) -I$(DEFOSDIR) - -# DO NOT REMOVE diff --git a/build.conf b/build.conf new file mode 100644 index 000000000..8d9c84181 --- /dev/null +++ b/build.conf @@ -0,0 +1,33 @@ +# +# Configuration file for APR. Used by APR/build/gen-build.py +# + +[options] + +paths = + atomic/{platform}/*.c + dso/{platform}/*.c + file_io/{platform}/*.c + locks/{platform}/*.c + memory/{platform}/*.c + misc/{platform}/*.c + mmap/{platform}/*.c + network_io/{platform}/*.c + passwd/*.c + poll/{platform}/*.c + random/{platform}/*.c + shmem/{platform}/*.c + strings/*.c + support/{platform}/*.c + tables/*.c + threadproc/{platform}/*.c + time/{platform}/*.c + user/{platform}/*.c + +headers = include/*.h + +# aplibtool is manually built by the configure process +# build/aplibtool.c + +# we have a recursive makefile for the test files (for now) +# test/*.c diff --git a/build/Makefile.in b/build/Makefile.in deleted file mode 100644 index c05665a19..000000000 --- a/build/Makefile.in +++ /dev/null @@ -1,12 +0,0 @@ -srcdir = @srcdir@ -VPATH = @srcdir@ - -TARGETS= -INCLUDES= -DISTCLEAN_TARGETS = apr_rules.mk -EXTRACLEAN_TARGETS = ltcf-c.sh ltmain.sh libtool.m4 - -# bring in rules.mk for standard functionality -@INCLUDE_RULES@ - -# DO NOT REMOVE diff --git a/build/apr_rules.mk.in b/build/apr_rules.mk.in index a23738738..392efa141 100644 --- a/build/apr_rules.mk.in +++ b/build/apr_rules.mk.in @@ -140,9 +140,9 @@ install: all-recursive all-recursive depend-recursive: @otarget=`echo $@ | sed s/-recursive//`; \ - list='$(SUBDIRS)'; \ + list='$(SOURCE_DIRS)'; \ for i in $$list; do \ - if test -d "$$i"; then \ + if test -f "$$i/Makefile"; then \ target="$$otarget"; \ echo "Making $$target in $$i"; \ if test "$$i" = "."; then \ @@ -161,9 +161,9 @@ all-recursive depend-recursive: clean-recursive distclean-recursive extraclean-recursive: @otarget=`echo $@ | sed s/-recursive//`; \ - list='$(SUBDIRS) $(CLEAN_SUBDIRS)'; \ + list='$(CLEAN_SUBDIRS)'; \ for i in $$list; do \ - if test -d "$$i"; then \ + if test -f "$$i/Makefile"; then \ target="$$otarget"; \ echo "Making $$target in $$i"; \ if test "$$i" = "."; then \ @@ -182,10 +182,17 @@ clean-recursive distclean-recursive extraclean-recursive: # autoconf 2.5x is creating a 'autom4te.cache' directory # In case someone ran autoconf by hand, get rid of that directory -# aswell. +# as well. local-clean: x-local-clean - $(RM) -f *.o *.lo *.a *.la *.so *.obj $(CLEAN_TARGETS) $(PROGRAMS) - $(RM) -rf .libs autom4te.cache + @list='. $(SOURCE_DIRS)'; \ + for i in $$list; do \ + echo $(RM) -f $$i/*.o $$i/*.lo $$i/*.a $$i/*.la $$i/*.so $$i/*.obj; \ + $(RM) -f $$i/*.o $$i/*.lo $$i/*.a $$i/*.la $$i/*.so $$i/*.obj; \ + echo $(RM) -rf $$i/.libs; \ + $(RM) -rf $$i/.libs; \ + done + $(RM) -f $(CLEAN_TARGETS) $(PROGRAMS) + $(RM) -rf autom4te.cache local-distclean: local-clean x-local-distclean $(RM) -f Makefile $(DISTCLEAN_TARGETS) diff --git a/build/gen-build.py b/build/gen-build.py new file mode 100755 index 000000000..6c6b07471 --- /dev/null +++ b/build/gen-build.py @@ -0,0 +1,100 @@ +#!/usr/bin/env python +# +# USAGE: gen-build.py TYPE +# +# where TYPE is one of: make, dsp, vcproj +# +# It reads build.conf from the current directory, and produces its output +# into the current directory. +# + + +import os +import ConfigParser +import getopt +import string +import glob +import re + +#import ezt + + +def main(): + parser = ConfigParser.ConfigParser() + parser.read('build.conf') + + dirs = { } + files = get_files(parser.get('options', 'paths')) + headers = get_files(parser.get('options', 'headers')) + + # compute the relevant headers, along with the implied includes + legal_deps = map(os.path.basename, headers) + h_deps = { } + for fname in headers: + h_deps[os.path.basename(fname)] = extract_deps(fname, legal_deps) + resolve_deps(h_deps) + + f = open('build-outputs.mk', 'w') + f.write('# DO NOT EDIT. AUTOMATICALLY GENERATED.\n\n') + + objects = [ ] + for file in files: + assert file[-2:] == '.c' + obj = file[:-2] + '.lo' + objects.append(obj) + + dirs[os.path.dirname(file)] = None + + # what headers does this file include, along with the implied headers + deps = extract_deps(file, legal_deps) + for hdr in deps.keys(): + deps.update(h_deps.get(hdr, {})) + + f.write('%s: %s %s\n' % (obj, file, string.join(deps.keys(), ' '))) + + f.write('\nOBJECTS = %s\n\n' % string.join(objects)) + f.write('HEADERS = %s\n\n' % string.join(headers)) + f.write('SOURCE_DIRS = %s\n\n' % string.join(dirs.keys())) + + +def extract_deps(fname, legal_deps): + "Extract the headers this file includes." + deps = { } + for line in open(fname).readlines(): + if line[:8] != '#include': + continue + inc = _re_include.match(line).group(1) + if inc in legal_deps: + deps[inc] = None + return deps +_re_include = re.compile('#include *["<](.*)[">]') + + +def resolve_deps(header_deps): + "Alter the provided dictionary to flatten includes-of-includes." + altered = 1 + while altered: + altered = 0 + for hdr, deps in header_deps.items(): + print hdr, deps + start = len(deps) + for dep in deps.keys(): + deps.update(header_deps.get(dep, {})) + if len(deps) != start: + altered = 1 + + +def get_files(patterns): + patterns = string.replace(patterns, '{platform}', get_platform()) + patterns = string.split(string.strip(patterns)) + files = [ ] + for pat in patterns: + files.extend(glob.glob(pat)) + return files + +def get_platform(): + return 'unix' + + +if __name__ == '__main__': + main() @@ -118,4 +118,7 @@ ${AUTOCONF:-autoconf} # Remove autoconf 2.5x's cache directory rm -rf autom4te*.cache +echo "Generating 'make' outputs ..." +build/gen-build.py make + exit 0 diff --git a/configure.in b/configure.in index 1e537fe72..f38a6136d 100644 --- a/configure.in +++ b/configure.in @@ -178,15 +178,15 @@ AC_ARG_WITH(libtool, [ --without-libtool avoid using libtool to link the [ use_libtool=$withval ], [ use_libtool="yes" ] ) if test "x$use_libtool" = "xyes"; then - lt_compile='$(LIBTOOL) $(LTFLAGS) --mode=compile $(COMPILE) -c $< && touch $@' + lt_compile='$(LIBTOOL) $(LTFLAGS) --mode=compile $(COMPILE) -o $@ -c $< && touch $@' LT_VERSION="-version-info `$get_version libtool $version_hdr APR`" link="\$(LIBTOOL) \$(LTFLAGS) --mode=link \$(LT_LDFLAGS) \$(COMPILE) ${LT_VERSION} \$(ALL_LDFLAGS) -o \$@" so_ext='lo' - lib_target='-rpath $(libdir) $$objects' - export_lib_target='-rpath \$(libdir) \$\$objects' + lib_target='-rpath $(libdir) $(OBJECTS)' + export_lib_target='-rpath \$(libdir) \$(OBJECTS)' else - lt_compile='$(COMPILE) -c $<' - link='$(AR) cr $(TARGET_LIB) $$objects; $(RANLIB) $(TARGET_LIB)' + lt_compile='$(COMPILE) -o $@ -c $<' + link='$(AR) cr $(TARGET_LIB) $(OBJECTS); $(RANLIB) $(TARGET_LIB)' so_ext='o' lib_target='' export_lib_target='' @@ -1873,24 +1873,10 @@ AC_SUBST(EXEEXT) AC_SUBST(LIBTOOL_LIBS) echo "${nl}Construct Makefiles and header files." -MAKEFILE1="Makefile strings/Makefile passwd/Makefile tables/Makefile build/Makefile" -SUBDIRS="strings passwd tables " -for dir in $apr_modules -do - test -d $dir || $MKDIR $dir - if test -f $srcdir/$dir/$OSDIR/Makefile.in; then - MAKEFILE2="$MAKEFILE2 $dir/$OSDIR/Makefile " - SUBDIRS="$SUBDIRS $dir/$OSDIR " - else - MAKEFILE2="$MAKEFILE2 $dir/$DEFAULT_OSDIR/Makefile " - SUBDIRS="$SUBDIRS $dir/$DEFAULT_OSDIR " - fi -done - +MAKEFILES="Makefile" if test -d $srcdir/test; then - MAKEFILE3="test/Makefile test/internal/Makefile" + MAKEFILES="$MAKEFILES test/Makefile test/internal/Makefile" fi -AC_SUBST(SUBDIRS) # # BSD/OS (BSDi) needs to use a different include syntax in the Makefiles @@ -1900,16 +1886,20 @@ case $host in # Check whether they've installed GNU make if make --version > /dev/null 2>&1; then INCLUDE_RULES="include $apr_buildout/apr_rules.mk" + INCLUDE_OUTPUTS="include build-outputs.mk" else # BSDi make INCLUDE_RULES=".include \"$apr_buildout/apr_rules.mk\"" + INCLUDE_OUTPUTS=".include \"build-outputs.mk\"" fi ;; *) INCLUDE_RULES="include $apr_buildout/apr_rules.mk" + INCLUDE_OUTPUTS="include build-outputs.mk" ;; esac AC_SUBST(INCLUDE_RULES) +AC_SUBST(INCLUDE_OUTPUTS) SAVE_FILES="include/apr.h include/arch/unix/apr_private.h" @@ -1921,7 +1911,7 @@ dir=include/arch/unix test -d $dir || $MKDIR $dir AC_OUTPUT([ - $MAKEFILE1 $MAKEFILE2 $MAKEFILE3 + $MAKEFILES include/apr.h build/apr_rules.mk apr-config @@ -1935,22 +1925,3 @@ for i in $SAVE_FILES; do done chmod +x apr-config ]) - -dnl ----------------------------- Fixup Makefiles for VPATH support - -changequote({,}) - -if test -n "$USE_VPATH"; then - for makefile in $MAKEFILE1 $MAKEFILE2 $MAKEFILE3; do - cat $makefile | \ - sed \ - -e 's#-I\($(INCDIR[0-9]*)\)#-I\1 -I$(srcdir)/\1#g' \ - -e 's#-I\($(OSDIR[0-9]*)\)#-I\1 -I$(srcdir)/\1#g' \ - -e 's#-I\($(DEFOSDIR[0-9]*)\)#-I\1 -I$(srcdir)/\1#g' \ - > tmp - cp tmp $makefile - done - rm -f tmp -fi - -changequote([,]) diff --git a/dso/aix/Makefile.in b/dso/aix/Makefile.in deleted file mode 100644 index 7d42bdedf..000000000 --- a/dso/aix/Makefile.in +++ /dev/null @@ -1,14 +0,0 @@ -srcdir = @srcdir@ -VPATH = @srcdir@ - -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) - -# DO NOT REMOVE diff --git a/dso/beos/Makefile.in b/dso/beos/Makefile.in deleted file mode 100644 index 02326f80e..000000000 --- a/dso/beos/Makefile.in +++ /dev/null @@ -1,13 +0,0 @@ -srcdir = @srcdir@ -VPATH = @srcdir@ - -TARGETS = dso.lo - -# bring in rules.mk for standard functionality -@INCLUDE_RULES@ - -INCDIR=../../include -DEFOSDIR=$(INCDIR)/arch/@DEFAULT_OSDIR@ -INCLUDES=-I$(INCDIR) -I$(INCDIR)/arch -I$(DEFOSDIR) - -# DO NOT REMOVE diff --git a/dso/os2/Makefile.in b/dso/os2/Makefile.in deleted file mode 100644 index 7d42bdedf..000000000 --- a/dso/os2/Makefile.in +++ /dev/null @@ -1,14 +0,0 @@ -srcdir = @srcdir@ -VPATH = @srcdir@ - -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) - -# DO NOT REMOVE diff --git a/dso/os390/Makefile.in b/dso/os390/Makefile.in deleted file mode 100644 index 7d42bdedf..000000000 --- a/dso/os390/Makefile.in +++ /dev/null @@ -1,14 +0,0 @@ -srcdir = @srcdir@ -VPATH = @srcdir@ - -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) - -# DO NOT REMOVE diff --git a/dso/unix/Makefile.in b/dso/unix/Makefile.in deleted file mode 100644 index 89c6b25b6..000000000 --- a/dso/unix/Makefile.in +++ /dev/null @@ -1,14 +0,0 @@ -srcdir = @srcdir@ -VPATH = @srcdir@ - -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) - -# DO NOT REMOVE diff --git a/file_io/os2/Makefile.in b/file_io/os2/Makefile.in deleted file mode 100644 index a87f42423..000000000 --- a/file_io/os2/Makefile.in +++ /dev/null @@ -1,31 +0,0 @@ -srcdir = @srcdir@ -VPATH = @srcdir@ - -TARGETS = \ - dir.lo \ - fileacc.lo \ - filedup.lo \ - filestat.lo \ - open.lo \ - pipe.lo \ - readwrite.lo \ - seek.lo \ - flock.lo \ - maperrorcode.lo \ - fullrw.lo \ - filepath.lo \ - filepath_util.lo \ - filesys.lo \ - mktemp.lo \ - copy.lo \ - tempdir.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) - -# DO NOT REMOVE diff --git a/file_io/unix/Makefile.in b/file_io/unix/Makefile.in deleted file mode 100644 index fbc93b1c7..000000000 --- a/file_io/unix/Makefile.in +++ /dev/null @@ -1,29 +0,0 @@ -srcdir = @srcdir@ -VPATH = @srcdir@ - -TARGETS = \ - copy.lo \ - dir.lo \ - fileacc.lo \ - filedup.lo \ - filepath.lo \ - filepath_util.lo \ - filestat.lo \ - flock.lo \ - fullrw.lo \ - open.lo \ - pipe.lo \ - readwrite.lo \ - seek.lo \ - mktemp.lo \ - tempdir.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) - -# DO NOT REMOVE diff --git a/locks/beos/Makefile.in b/locks/beos/Makefile.in deleted file mode 100644 index 6c8a1bccd..000000000 --- a/locks/beos/Makefile.in +++ /dev/null @@ -1,16 +0,0 @@ -srcdir = @srcdir@ -VPATH = @srcdir@ - -TARGETS = \ - thread_mutex.lo \ - thread_rwlock.lo \ - thread_cond.lo \ - proc_mutex.lo - -# bring in rules.mk for standard functionality -@INCLUDE_RULES@ - -INCDIR=../../include -INCLUDES=-I$(INCDIR) -I$(INCDIR)/arch - -# DO NOT REMOVE diff --git a/locks/os2/Makefile.in b/locks/os2/Makefile.in deleted file mode 100644 index e22f85c97..000000000 --- a/locks/os2/Makefile.in +++ /dev/null @@ -1,18 +0,0 @@ -srcdir = @srcdir@ -VPATH = @srcdir@ - -TARGETS = \ - thread_mutex.lo \ - thread_rwlock.lo \ - thread_cond.lo \ - proc_mutex.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) - -# DO NOT REMOVE diff --git a/locks/unix/Makefile.in b/locks/unix/Makefile.in deleted file mode 100644 index 618b0eb1a..000000000 --- a/locks/unix/Makefile.in +++ /dev/null @@ -1,19 +0,0 @@ -srcdir = @srcdir@ -VPATH = @srcdir@ - -TARGETS = \ - thread_mutex.lo \ - thread_rwlock.lo \ - thread_cond.lo \ - proc_mutex.lo \ - global_mutex.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) - -# DO NOT REMOVE diff --git a/memory/unix/Makefile.in b/memory/unix/Makefile.in deleted file mode 100644 index 2be5dd963..000000000 --- a/memory/unix/Makefile.in +++ /dev/null @@ -1,13 +0,0 @@ -srcdir = @srcdir@ -VPATH = @srcdir@ - -TARGETS = apr_pools.lo - -# bring in rules.mk for standard functionality -@INCLUDE_RULES@ - -DEFOSDIR=$(INCDIR)/arch/@DEFAULT_OSDIR@ -INCDIR=../../include -INCLUDES=-I$(INCDIR) -I$(DEFOSDIR) - -# DO NOT REMOVE diff --git a/misc/unix/Makefile.in b/misc/unix/Makefile.in deleted file mode 100644 index fffd81c16..000000000 --- a/misc/unix/Makefile.in +++ /dev/null @@ -1,16 +0,0 @@ -srcdir = @srcdir@ -VPATH = @srcdir@ - -TARGETS = \ - start.lo getopt.lo otherchild.lo errorcodes.lo rand.lo version.lo \ - charset.lo env.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) - -# DO NOT REMOVE diff --git a/mmap/unix/Makefile.in b/mmap/unix/Makefile.in deleted file mode 100644 index 11dde0670..000000000 --- a/mmap/unix/Makefile.in +++ /dev/null @@ -1,13 +0,0 @@ -srcdir = @srcdir@ -VPATH = @srcdir@ - -TARGETS = mmap.lo common.lo - -# bring in rules.mk for standard functionality -@INCLUDE_RULES@ - -DEFOSDIR=$(INCDIR)/arch/@DEFAULT_OSDIR@ -INCDIR=../../include -INCLUDES=-I$(INCDIR) -I$(DEFOSDIR) - -# DO NOT REMOVE diff --git a/network_io/beos/Makefile.in b/network_io/beos/Makefile.in deleted file mode 100644 index b2c93fbbf..000000000 --- a/network_io/beos/Makefile.in +++ /dev/null @@ -1,14 +0,0 @@ -srcdir = @srcdir@ -VPATH = @srcdir@ - -TARGETS = 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) - -# DO NOT REMOVE diff --git a/network_io/os2/Makefile.in b/network_io/os2/Makefile.in deleted file mode 100644 index 04b8e32df..000000000 --- a/network_io/os2/Makefile.in +++ /dev/null @@ -1,22 +0,0 @@ -srcdir = @srcdir@ -VPATH = @srcdir@ - -TARGETS = \ - sendrecv.lo \ - sendrecv_udp.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) - -# DO NOT REMOVE diff --git a/network_io/unix/Makefile.in b/network_io/unix/Makefile.in deleted file mode 100644 index 3ea7d03bd..000000000 --- a/network_io/unix/Makefile.in +++ /dev/null @@ -1,20 +0,0 @@ -srcdir = @srcdir@ -VPATH = @srcdir@ - -TARGETS = \ - 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) - -# DO NOT REMOVE diff --git a/passwd/Makefile.in b/passwd/Makefile.in deleted file mode 100644 index 162d415ea..000000000 --- a/passwd/Makefile.in +++ /dev/null @@ -1,13 +0,0 @@ -srcdir = @srcdir@ -VPATH = @srcdir@ - -TARGETS = apr_getpass.lo - -# bring in rules.mk for standard functionality -@INCLUDE_RULES@ - -INCDIR=../include -DEFOSDIR=$(INCDIR)/arch/@DEFAULT_OSDIR@ -INCLUDES=-I$(INCDIR) -I$(DEFOSDIR) - -# DO NOT REMOVE diff --git a/poll/os2/Makefile.in b/poll/os2/Makefile.in deleted file mode 100755 index 96fc006fe..000000000 --- a/poll/os2/Makefile.in +++ /dev/null @@ -1,17 +0,0 @@ -srcdir = @srcdir@ -VPATH = @srcdir@ - -TARGETS = \ - poll.lo \ - pollset.lo \ - pollacc.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) - -# DO NOT REMOVE diff --git a/poll/unix/Makefile.in b/poll/unix/Makefile.in deleted file mode 100755 index e4594d35b..000000000 --- a/poll/unix/Makefile.in +++ /dev/null @@ -1,16 +0,0 @@ -srcdir = @srcdir@ -VPATH = @srcdir@ - -TARGETS = \ - poll.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) - -# DO NOT REMOVE diff --git a/random/unix/Makefile.in b/random/unix/Makefile.in deleted file mode 100644 index de384368b..000000000 --- a/random/unix/Makefile.in +++ /dev/null @@ -1,18 +0,0 @@ -srcdir = @srcdir@ -VPATH = @srcdir@ - -TARGETS = \ - apr_random.lo \ - sha2.lo \ - sha2_glue.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) - -# DO NOT REMOVE diff --git a/shmem/beos/Makefile.in b/shmem/beos/Makefile.in deleted file mode 100644 index 52447d8be..000000000 --- a/shmem/beos/Makefile.in +++ /dev/null @@ -1,14 +0,0 @@ -srcdir = @srcdir@ -VPATH = @srcdir@ - -TARGETS = shm.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) - -# DO NOT REMOVE diff --git a/shmem/os2/Makefile.in b/shmem/os2/Makefile.in deleted file mode 100644 index 52447d8be..000000000 --- a/shmem/os2/Makefile.in +++ /dev/null @@ -1,14 +0,0 @@ -srcdir = @srcdir@ -VPATH = @srcdir@ - -TARGETS = shm.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) - -# DO NOT REMOVE diff --git a/shmem/unix/Makefile.in b/shmem/unix/Makefile.in deleted file mode 100644 index b155d75b7..000000000 --- a/shmem/unix/Makefile.in +++ /dev/null @@ -1,14 +0,0 @@ -srcdir = @srcdir@ -VPATH = @srcdir@ - -TARGETS = shm.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) - -# DO NOT REMOVE diff --git a/strings/Makefile.in b/strings/Makefile.in deleted file mode 100644 index aa1e1ee0e..000000000 --- a/strings/Makefile.in +++ /dev/null @@ -1,19 +0,0 @@ -srcdir = @srcdir@ -VPATH = @srcdir@ - -TARGETS = \ - apr_cpystrn.lo \ - apr_snprintf.lo \ - apr_strnatcmp.lo \ - apr_strings.lo \ - apr_fnmatch.lo \ - apr_strtok.lo - -# bring in rules.mk for standard functionality -@INCLUDE_RULES@ - -DEFOSDIR=$(INCDIR)/arch/@DEFAULT_OSDIR@ -INCDIR=../include -INCLUDES=-I$(INCDIR) -I$(DEFOSDIR) - -# DO NOT REMOVE diff --git a/support/unix/Makefile.in b/support/unix/Makefile.in deleted file mode 100755 index 190cacfc2..000000000 --- a/support/unix/Makefile.in +++ /dev/null @@ -1,15 +0,0 @@ -srcdir = @srcdir@ -VPATH = @srcdir@ - -TARGETS = \ - waitio.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) - -# DO NOT REMOVE diff --git a/tables/Makefile.in b/tables/Makefile.in deleted file mode 100644 index 9a97a30f1..000000000 --- a/tables/Makefile.in +++ /dev/null @@ -1,13 +0,0 @@ -srcdir = @srcdir@ -VPATH = @srcdir@ - -TARGETS = apr_tables.lo apr_hash.lo - -# bring in rules.mk for standard functionality -@INCLUDE_RULES@ - -DEFOSDIR=$(INCDIR)/arch/@DEFAULT_OSDIR@ -INCDIR=../include -INCLUDES=-I$(INCDIR) -I$(DEFOSDIR) - -# DO NOT REMOVE diff --git a/threadproc/beos/Makefile.in b/threadproc/beos/Makefile.in deleted file mode 100644 index 3bdf1dd53..000000000 --- a/threadproc/beos/Makefile.in +++ /dev/null @@ -1,25 +0,0 @@ -srcdir = @srcdir@ -VPATH = @srcdir@ - -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) - -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 - -# DO NOT REMOVE diff --git a/threadproc/os2/Makefile.in b/threadproc/os2/Makefile.in deleted file mode 100644 index 3cc12ad74..000000000 --- a/threadproc/os2/Makefile.in +++ /dev/null @@ -1,18 +0,0 @@ -srcdir = @srcdir@ -VPATH = @srcdir@ - -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) - -# DO NOT REMOVE diff --git a/threadproc/unix/Makefile.in b/threadproc/unix/Makefile.in deleted file mode 100644 index 42aa6d1b6..000000000 --- a/threadproc/unix/Makefile.in +++ /dev/null @@ -1,18 +0,0 @@ -srcdir = @srcdir@ -VPATH = @srcdir@ - -TARGETS = \ - proc.lo \ - procsup.lo \ - thread.lo \ - threadpriv.lo \ - signals.lo - -# bring in rules.mk for standard functionality -@INCLUDE_RULES@ - -INCDIR=../../include -DEFOSDIR=$(INCDIR)/arch/@DEFAULT_OSDIR@ -INCLUDES=-I$(INCDIR) -I$(DEFOSDIR) - -# DO NOT REMOVE diff --git a/time/unix/Makefile.in b/time/unix/Makefile.in deleted file mode 100644 index 1cc010b5d..000000000 --- a/time/unix/Makefile.in +++ /dev/null @@ -1,13 +0,0 @@ -srcdir = @srcdir@ -VPATH = @srcdir@ - -TARGETS = time.lo timestr.lo - -# bring in rules.mk for standard functionality -@INCLUDE_RULES@ - -DEFOSDIR=$(INCDIR)/arch/@DEFAULT_OSDIR@ -INCDIR=../../include -INCLUDES=-I$(INCDIR) -I$(DEFOSDIR) - -# DO NOT REMOVE diff --git a/user/unix/Makefile.in b/user/unix/Makefile.in deleted file mode 100644 index 100498f5f..000000000 --- a/user/unix/Makefile.in +++ /dev/null @@ -1,13 +0,0 @@ -srcdir = @srcdir@ -VPATH = @srcdir@ - -TARGETS = userinfo.lo groupinfo.lo - -# bring in rules.mk for standard functionality -@INCLUDE_RULES@ - -INCDIR=../../include -DEFOSDIR=$(INCDIR)/arch/@DEFAULT_OSDIR@ -INCLUDES=-I$(INCDIR) -I$(DEFOSDIR) - -# DO NOT REMOVE |