diff options
| author | sascha <sascha@13f79535-47bb-0310-9956-ffa450edef68> | 2000-04-30 17:58:34 +0000 |
|---|---|---|
| committer | sascha <sascha@13f79535-47bb-0310-9956-ffa450edef68> | 2000-04-30 17:58:34 +0000 |
| commit | 4055c214060974403f9ddb06fc6f30fe38e5e209 (patch) | |
| tree | e3d20968cbb191de3a5701dfe92ffc136906c8a1 /shmem | |
| parent | 52de50d04ac8be9d601020a0125066e0beb71d2d (diff) | |
| download | libapr-4055c214060974403f9ddb06fc6f30fe38e5e209.tar.gz | |
Make `mm' an INCDIR in shmem/unix, so that the INCDIR rewriter can
automatically adapt it for VPATH use.
Remove $(OBJS): Makefile dependency to avoid unnecessary rebuilds.
git-svn-id: http://svn.apache.org/repos/asf/apr/apr/trunk@59998 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'shmem')
| -rw-r--r-- | shmem/os2/Makefile.in | 1 | ||||
| -rw-r--r-- | shmem/unix/Makefile.in | 10 |
2 files changed, 5 insertions, 6 deletions
diff --git a/shmem/os2/Makefile.in b/shmem/os2/Makefile.in index ec9174c6d..f2dd8bce2 100644 --- a/shmem/os2/Makefile.in +++ b/shmem/os2/Makefile.in @@ -28,7 +28,6 @@ clean: distclean: clean -$(RM) -f Makefile -$(OBJS): Makefile $(LIB): $(OBJS) $(RM) -f $@ diff --git a/shmem/unix/Makefile.in b/shmem/unix/Makefile.in index d71b1785c..b2156bde2 100644 --- a/shmem/unix/Makefile.in +++ b/shmem/unix/Makefile.in @@ -12,7 +12,8 @@ LDFLAGS=@LDFLAGS@ $(LIBS) INCDIR=../../inc INCDIR1=../../include INCDIR2=../../misc/@OSDIR@ -INCLUDES=-I$(INCDIR) -I$(INCDIR1) -I$(INCDIR2) -Imm -I. +INCDIR3=mm +INCLUDES=-I$(INCDIR) -I$(INCDIR1) -I$(INCDIR2) -I$(INCDIR3) -I. LIB=libshmem.a @@ -25,17 +26,16 @@ all: $(LIB) clean: $(RM) -f *.o *.a *.so - cd mm; $(MAKE) clean; cd .. + (cd mm && $(MAKE) clean) distclean: clean -$(RM) -f Makefile - cd mm; $(MAKE) distclean; cd .. + (cd mm && $(MAKE) distclean) -$(OBJS): Makefile $(LIB): $(OBJS) $(RM) -f $@ - cd mm; $(MAKE); cd .. + (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) $@ |