diff options
| -rw-r--r-- | Makefile.in | 12 | ||||
| -rw-r--r-- | test/Makefile.in | 4 |
2 files changed, 9 insertions, 7 deletions
diff --git a/Makefile.in b/Makefile.in index 59dd2e00c..0a7e7db40 100644 --- a/Makefile.in +++ b/Makefile.in @@ -39,12 +39,14 @@ SUBDIRS=@SUBDIRS@ # building the entire package. # all: Makefile $(MODULES) subdirs - @rm -Rf libs - @mkdir libs - @for i in $(SUBDIRS); do cp $$i/*.a libs ; done; + @rm -Rf objs + @mkdir objs + @rm -f @LIBPREFIX@apr.a + @for i in $(SUBDIRS); do cp $$i/*.o objs ; done; + @$(AR) cr @LIBPREFIX@apr.a objs/*.o clean: subdirs_clean - $(RM) -f *.o *.a *.so + $(RM) -f *.o *.a *.so objs/*.o depend: subdirs_depend @@ -52,7 +54,7 @@ distclean: subdirs_distclean -$(RM) -f *.o *.a *.so -$(RM) -f config.cache config.status config.log -$(RM) -f Makefile - -$(RM) -Rf libs + -$(RM) -Rf objs subdirs: @for i in $(SUBDIRS); do \ diff --git a/test/Makefile.in b/test/Makefile.in index fdd5872ff..77b936814 100644 --- a/test/Makefile.in +++ b/test/Makefile.in @@ -8,7 +8,7 @@ RM=@RM@ CC=@CC@ RANLIB=@RANLIB@ CFLAGS=@CFLAGS@ @OPTIM@ -LIBS=-L../libs -lnetwork -lthreadproc -lfile -lmisc -lapr -ltime -llock -lsig -lmmap @LIBS@ +LIBS=-L.. -lapr @LIBS@ LDFLAGS=@LDFLAGS@ $(LIBS) INCDIR=../include INCDIR1=../../inc @@ -24,7 +24,7 @@ TARGETS= testfile@EXEEXT@ \ testcontext@EXEEXT@ \ ab@EXEEXT@ \ htdigest@EXEEXT@ \ - testmmap@EXEEXT@ + testmmap@EXEEXT@ OBJS= testfile.o \ testproc.o \ |