diff options
| author | Greg Stein <gstein@apache.org> | 2004-02-05 10:16:25 +0000 |
|---|---|---|
| committer | Greg Stein <gstein@apache.org> | 2004-02-05 10:16:25 +0000 |
| commit | 7f5b352d208fc156d060afc3d4d9bd6dd02472dc (patch) | |
| tree | cfa5a711c027d72cc924b6fe5e6451b8d81fbe2c /shmem | |
| parent | 4ee50c35aa2cd7184e3e6ec836f469f08bd003f5 (diff) | |
| download | apr-7f5b352d208fc156d060afc3d4d9bd6dd02472dc.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: https://svn.apache.org/repos/asf/apr/apr/trunk@64891 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'shmem')
| -rw-r--r-- | shmem/beos/Makefile.in | 14 | ||||
| -rw-r--r-- | shmem/os2/Makefile.in | 14 | ||||
| -rw-r--r-- | shmem/unix/Makefile.in | 14 |
3 files changed, 0 insertions, 42 deletions
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 |