From 9d1275e1a983a06ce2634ea7fda44e1da74c83b7 Mon Sep 17 00:00:00 2001 From: gstein Date: Tue, 9 Jan 2001 11:06:28 +0000 Subject: 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 --- dso/aix/.cvsignore | 3 +++ dso/aix/Makefile.in | 35 +++++------------------------------ dso/beos/.cvsignore | 3 ++- dso/beos/Makefile.in | 36 ++++++------------------------------ dso/os2/.cvsignore | 2 ++ dso/os2/Makefile.in | 37 ++++++------------------------------- dso/os390/.cvsignore | 2 ++ dso/os390/Makefile.in | 34 +++++----------------------------- dso/unix/.cvsignore | 2 ++ dso/unix/Makefile.in | 38 ++++++-------------------------------- 10 files changed, 39 insertions(+), 153 deletions(-) create mode 100644 dso/aix/.cvsignore (limited to 'dso') diff --git a/dso/aix/.cvsignore b/dso/aix/.cvsignore new file mode 100644 index 000000000..06e18a7aa --- /dev/null +++ b/dso/aix/.cvsignore @@ -0,0 +1,3 @@ +Makefile +*.lo +.libs diff --git a/dso/aix/Makefile.in b/dso/aix/Makefile.in index 22ac4f1f8..1fed55114 100644 --- a/dso/aix/Makefile.in +++ b/dso/aix/Makefile.in @@ -1,35 +1,10 @@ -RM=@RM@ -CC=@CC@ -RANLIB=@RANLIB@ -CFLAGS=@CFLAGS@ @OPTIM@ -LIBS=@LIBS@ -LDFLAGS=@LDFLAGS@ $(LIBS) -INCDIR=../../include -INCLUDES=-I$(INCDIR) -I$(INCDIR)/arch -MKDEP=../../helpers/mkdep.sh - -LIB=libdso.a - -OBJS=dso.o - -.c.o: - $(CC) $(CFLAGS) -c $(INCLUDES) $< -all: $(LIB) +TARGETS = dso.lo -clean: - $(RM) -f *.o *.a *.so +# bring in rules.mk for standard functionality +@INCLUDE_RULES@ -distclean: clean - -$(RM) -f Makefile - - -$(LIB): $(OBJS) - $(RM) -f $@ - $(AR) cr $@ $(OBJS) - $(RANLIB) $@ - -depend: - $(MKDEP) $(INCLUDES) $(CFLAGS) *.c +INCDIR=../../include +INCLUDES=-I$(INCDIR) -I$(INCDIR)/arch # DO NOT REMOVE diff --git a/dso/beos/.cvsignore b/dso/beos/.cvsignore index 550bd25cd..06e18a7aa 100644 --- a/dso/beos/.cvsignore +++ b/dso/beos/.cvsignore @@ -1,2 +1,3 @@ Makefile - +*.lo +.libs diff --git a/dso/beos/Makefile.in b/dso/beos/Makefile.in index 266554101..7599158d2 100644 --- a/dso/beos/Makefile.in +++ b/dso/beos/Makefile.in @@ -1,35 +1,11 @@ -CC=@CC@ -RANLIB=@RANLIB@ -CFLAGS=@CFLAGS@ @OPTIM@ -LIBS=@LIBS@ -LDFLAGS=@LDFLAGS@ $(LIBS) -INCDIR=../../include -DEFOSDIR=$(INCDIR)/arch/@DEFAULT_OSDIR@ -INCLUDES=-I$(INCDIR) -I$(INCDIR)/arch -I$(DEFOSDIR) -MKDEP=../../helpers/mkdep.sh - -LIB=libdso.a - -OBJS=dso.o - -.c.o: - $(CC) $(CFLAGS) -c $(INCLUDES) $< -all: $(LIB) +TARGETS = dso.lo -clean: - $(RM) -f *.o *.a *.so +# bring in rules.mk for standard functionality +@INCLUDE_RULES@ -distclean: clean - -$(RM) -f Makefile - - -$(LIB): $(OBJS) - $(RM) -f $@ - $(AR) cr $@ $(OBJS) - $(RANLIB) $@ - -depend: - $(MKDEP) $(INCLUDES) $(CFLAGS) *.c +INCDIR=../../include +DEFOSDIR=$(INCDIR)/arch/@DEFAULT_OSDIR@ +INCLUDES=-I$(INCDIR) -I$(INCDIR)/arch -I$(DEFOSDIR) # DO NOT REMOVE diff --git a/dso/os2/.cvsignore b/dso/os2/.cvsignore index f3c7a7c5d..06e18a7aa 100644 --- a/dso/os2/.cvsignore +++ b/dso/os2/.cvsignore @@ -1 +1,3 @@ Makefile +*.lo +.libs diff --git a/dso/os2/Makefile.in b/dso/os2/Makefile.in index ba2385b0a..fe018d7d4 100644 --- a/dso/os2/Makefile.in +++ b/dso/os2/Makefile.in @@ -1,37 +1,12 @@ -SHELL=@SH@ -CC=@CC@ -RANLIB=@RANLIB@ -CFLAGS=@CFLAGS@ @OPTIM@ -LIBS=@LIBS@ -LDFLAGS=@LDFLAGS@ $(LIBS) + +TARGETS = dso.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=libdso.a - -OBJS=dso.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/dso/os390/.cvsignore b/dso/os390/.cvsignore index f3c7a7c5d..06e18a7aa 100644 --- a/dso/os390/.cvsignore +++ b/dso/os390/.cvsignore @@ -1 +1,3 @@ Makefile +*.lo +.libs diff --git a/dso/os390/Makefile.in b/dso/os390/Makefile.in index 134195b68..1fed55114 100644 --- a/dso/os390/Makefile.in +++ b/dso/os390/Makefile.in @@ -1,34 +1,10 @@ -RM=@RM@ -CC=@CC@ -RANLIB=@RANLIB@ -CFLAGS=@CFLAGS@ @OPTIM@ -LIBS=@LIBS@ -LDFLAGS=@LDFLAGS@ $(LIBS) -INCDIR=../../include -INCLUDES=-I$(INCDIR) -I$(INCDIR)/arch -MKDEP=../../helpers/mkdep.sh - -LIB=libdso.a - -OBJS=dso.o - -.c.o: - $(CC) $(CFLAGS) -c $(INCLUDES) $< -all: $(LIB) +TARGETS = dso.lo -clean: - $(RM) -f *.o *.a *.so +# bring in rules.mk for standard functionality +@INCLUDE_RULES@ -$(LIB): $(OBJS) - $(RM) -f $@ - $(AR) cr $@ $(OBJS) - $(RANLIB) $@ - -distclean: clean - -$(RM) -f Makefile - -depend: - $(MKDEP) $(INCLUDES) $(CFLAGS) *.c +INCDIR=../../include +INCLUDES=-I$(INCDIR) -I$(INCDIR)/arch # DO NOT REMOVE diff --git a/dso/unix/.cvsignore b/dso/unix/.cvsignore index f3c7a7c5d..06e18a7aa 100644 --- a/dso/unix/.cvsignore +++ b/dso/unix/.cvsignore @@ -1 +1,3 @@ Makefile +*.lo +.libs diff --git a/dso/unix/Makefile.in b/dso/unix/Makefile.in index c3d9c2b42..21cac34c2 100644 --- a/dso/unix/Makefile.in +++ b/dso/unix/Makefile.in @@ -1,38 +1,12 @@ -RM=@RM@ -CC=@CC@ -AR=@AR@ -RANLIB=@RANLIB@ -CFLAGS=@CFLAGS@ @OPTIM@ -LIBS=@LIBS@ -LDFLAGS=@LDFLAGS@ $(LIBS) + +TARGETS = dso.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) -MKDEP=../../helpers/mkdep.sh - -LIB=libdso.a - -OBJS=dso.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 -- cgit v1.2.1