diff options
Diffstat (limited to 'dso')
| -rw-r--r-- | dso/os390/Makefile.in | 36 | ||||
| -rw-r--r-- | dso/unix/Makefile.in | 24 |
2 files changed, 7 insertions, 53 deletions
diff --git a/dso/os390/Makefile.in b/dso/os390/Makefile.in index c5df58c36..134195b68 100644 --- a/dso/os390/Makefile.in +++ b/dso/os390/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@ RANLIB=@RANLIB@ @@ -11,6 +6,7 @@ LIBS=@LIBS@ LDFLAGS=@LDFLAGS@ $(LIBS) INCDIR=../../include INCLUDES=-I$(INCDIR) -I$(INCDIR)/arch +MKDEP=../../helpers/mkdep.sh LIB=libdso.a @@ -24,37 +20,15 @@ all: $(LIB) clean: $(RM) -f *.o *.a *.so -distclean: clean - -$(RM) -f Makefile - - $(LIB): $(OBJS) $(RM) -f $@ $(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. -# +distclean: clean + -$(RM) -f Makefile + 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 -getopt.o: getopt.c misc.h ../../include/apr_private.h \ - ../../include/apr_general.h ../../include/apr.h \ - ../../include/apr_errno.h ../../include/apr_pools.h \ - ../../include/apr_lib.h ../../include/apr_file_io.h \ - ../../include/apr_getopt.h -start.o: start.c misc.h ../../include/apr_private.h \ - ../../include/apr_general.h ../../include/apr.h \ - ../../include/apr_errno.h ../../include/apr_pools.h \ - ../../include/apr_lib.h ../../include/apr_file_io.h \ - ../../include/apr_getopt.h diff --git a/dso/unix/Makefile.in b/dso/unix/Makefile.in index 51ba22815..e4f0e1a90 100644 --- a/dso/unix/Makefile.in +++ b/dso/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@ @@ -12,6 +7,7 @@ LIBS=@LIBS@ LDFLAGS=@LDFLAGS@ $(LIBS) INCDIR=../../include INCLUDES=-I$(INCDIR) -I$(INCDIR)/arch +MKDEP=../../helpers/mkdep.sh LIB=libdso.a @@ -34,23 +30,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 -dso.o: dso.c $(INCDIR)/arch/unix/dso.h $(INCDIR)/apr_private.h \ - $(INCDIR)/apr_general.h $(INCDIR)/apr.h \ - $(INCDIR)/apr_errno.h $(INCDIR)/apr_pools.h \ - $(INCDIR)/apr_thread_proc.h $(INCDIR)/apr_file_io.h \ - $(INCDIR)/apr_time.h $(INCDIR)/apr_dso.h |