summaryrefslogtreecommitdiff
path: root/network_io
diff options
context:
space:
mode:
authorgstein <gstein@13f79535-47bb-0310-9956-ffa450edef68>2004-02-05 10:16:25 +0000
committergstein <gstein@13f79535-47bb-0310-9956-ffa450edef68>2004-02-05 10:16:25 +0000
commit8da7c3fce4273030cc1d3d8037bccf1fcbd2ddf8 (patch)
treecfa5a711c027d72cc924b6fe5e6451b8d81fbe2c /network_io
parent78df145d7c0bfbb8bb3fac551b73caa012f6ffe9 (diff)
downloadlibapr-8da7c3fce4273030cc1d3d8037bccf1fcbd2ddf8.tar.gz
First whack at switching to a single top-level make. This adds a dependency
upon Python at packaging time, but not at end-user config/build time. As far as I can tell, the build continues to function properly. (out-of-dir config/make not tested, and apr-iconv prolly needs some work) The buildconf scripts now generate a build-outputs.mk file which is included by the root's Makefile (via the build/gen-build.py script). bulid-outputs.mk specifies all of the various files present in the distribution. The top-level Makefiles were simplified to use an $(OBJECTS) symbol rather than 'find'ing them. Similarly, a $(HEADERS) symbol is used for the exports. The corresponding delete-* targets were eliminated since we have a precise set of inputs. The subdirs' Makefiles were removed since they are no longer called/used. The apr-util/uri Makefile was responsible for compiling a C program to generate the uri_delims.h file. That process was replaced by a Python script to generate the header (called by buildconf). The .c and .dsp were left for the Windows build to continue, but that should be revamped. build/apr_rules.mk was revamped somewhat to avoid recursion, but a lot of cleanup is still needed. Much of the recursive/local/x- logic is no longer needed and can be elimianated. rules.mk was created for inclusion by N makefiles, but that isn't really true any more, so it could probably be tossed (caveat: test/Makefile). Saved for a phase 2. Some additional work was added to properly clean up files in */build/, rather than relying on a makefile in there. git-svn-id: http://svn.apache.org/repos/asf/apr/apr/trunk@64891 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'network_io')
-rw-r--r--network_io/beos/Makefile.in14
-rw-r--r--network_io/os2/Makefile.in22
-rw-r--r--network_io/unix/Makefile.in20
3 files changed, 0 insertions, 56 deletions
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