diff options
author | gstein <gstein@13f79535-47bb-0310-9956-ffa450edef68> | 2001-01-09 11:06:28 +0000 |
---|---|---|
committer | gstein <gstein@13f79535-47bb-0310-9956-ffa450edef68> | 2001-01-09 11:06:28 +0000 |
commit | 9d1275e1a983a06ce2634ea7fda44e1da74c83b7 (patch) | |
tree | e51da863a0ead61ec23171879295613e7cd48b68 /shmem | |
parent | 95a1aa1fa02cb63a6447b0fe8528f5ba03eacbfe (diff) | |
download | libapr-9d1275e1a983a06ce2634ea7fda44e1da74c83b7.tar.gz |
Libtool-ize APR.
To simplify the task, I also shifted the Makefiles to include a rules.mk
(based on APRUTIL's with a few tweaks). Still needs some work to remove the
INCLUDES setup in all the Makefiles (these can be shared).
buildconf now does more work (and generates some output)
aclocal.m4 is based on a number of M4 files, rather than standalone
apr/test/ has been updated but is probably broken in a few ways.
objs/ is now gone. we link directly from the .lo files.
git-svn-id: http://svn.apache.org/repos/asf/apr/apr/trunk@61037 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'shmem')
-rw-r--r-- | shmem/os2/.cvsignore | 2 | ||||
-rw-r--r-- | shmem/os2/Makefile.in | 36 | ||||
-rw-r--r-- | shmem/unix/.cvsignore | 2 | ||||
-rw-r--r-- | shmem/unix/Makefile.in | 44 |
4 files changed, 25 insertions, 59 deletions
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 |