diff options
| author | trawick <trawick@13f79535-47bb-0310-9956-ffa450edef68> | 2000-11-15 11:50:11 +0000 |
|---|---|---|
| committer | trawick <trawick@13f79535-47bb-0310-9956-ffa450edef68> | 2000-11-15 11:50:11 +0000 |
| commit | ebcd7d0599802b7f876f0973b08fc9f69fa8c5ae (patch) | |
| tree | e57128f7208a17a1dc758a74369eee632faea8e9 /shmem | |
| parent | cfd48471d5b9d6e8641a9259d95665f86b8905d6 (diff) | |
| download | libapr-ebcd7d0599802b7f876f0973b08fc9f69fa8c5ae.tar.gz | |
This patch removes the dependencies from Makefile.in. Dependencies
will not be checked into CVS, as they are added to Makefile when the
user runs "make depend." The exact mechanism for building
dependencies is moved to a script called mkdep.sh in the APR helpers
directory. Folks are free to make the mechanism more general (i.e.,
work on systems without gcc -MM), but for now it still requires gcc
-MM. The patch also removes some commented out variable definitions
and rules.
BeOS- and OS/2-specific makefiles have not been updated. I'll post a
patch to those or go ahead and commit them later, but David and Brian
will get to test them.
git-svn-id: http://svn.apache.org/repos/asf/apr/apr/trunk@60727 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'shmem')
| -rw-r--r-- | shmem/unix/Makefile.in | 22 |
1 files changed, 2 insertions, 20 deletions
diff --git a/shmem/unix/Makefile.in b/shmem/unix/Makefile.in index ab16d9736..18c95cd96 100644 --- a/shmem/unix/Makefile.in +++ b/shmem/unix/Makefile.in @@ -1,8 +1,3 @@ -#CFLAGS=$(OPTIM) $(CFLAGS1) $(EXTRA_CFLAGS) -#LIBS=$(EXTRA_LIBS) $(LIBS1) -#INCLUDES=$(INCLUDES1) $(INCLUDES0) $(EXTRA_INCLUDES) -#LDFLAGS=$(LDFLAGS1) $(EXTRA_LDFLAGS) - RM=@RM@ CC=@CC@ AR=@AR@ @@ -13,6 +8,7 @@ LDFLAGS=@LDFLAGS@ $(LIBS) INCDIR=../../include INCDIR1=mm INCLUDES=-I$(INCDIR) -I$(INCDIR1) +MKDEP=../../helpers/mkdep.sh LIB=libshmem.a @@ -39,21 +35,7 @@ $(LIB): $(OBJS) $(AR) cr $@ $(OBJS) $(RANLIB) $@ -# -# We really don't expect end users to use this rule. It works only with -# gcc, and rebuilds Makefile.in. You have to re-run configure after -# using it. -# depend: - cp Makefile.in Makefile.in.bak \ - && sed -ne '1,/^# DO NOT REMOVE/p' Makefile.in > Makefile.new \ - && gcc -MM $(INCLUDES) $(CFLAGS) *.c >> Makefile.new \ - && sed -e '1,$$s: $(INCDIR)/: $$(INCDIR)/:g' \ - -e '1,$$s: $(OSDIR)/: $$(OSDIR)/:g' Makefile.new \ - > Makefile.in \ - && rm Makefile.new + $(MKDEP) $(INCLUDES) $(CFLAGS) *.c # DO NOT REMOVE -shmem.o: shmem.c mm/mm.h $(INCDIR)/apr_general.h \ - $(INCDIR)/apr.h $(INCDIR)/apr_errno.h \ - $(INCDIR)/apr_shmem.h |