summaryrefslogtreecommitdiff
path: root/locks
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 /locks
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 'locks')
-rw-r--r--locks/beos/Makefile.in16
-rw-r--r--locks/os2/Makefile.in18
-rw-r--r--locks/unix/Makefile.in19
3 files changed, 0 insertions, 53 deletions
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