httpd-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Jeff Trawick <trawi...@bellsouth.net>
Subject Re: architecture-specific directories
Date Tue, 14 Nov 2000 23:56:44 GMT
Before I go too far, let me post a sketch of where I am headed:

After running configure, "make depend" from the apr base directory
will do the right thing.

Code changes:

1) Create lib/apr/build/rules.mk with this line:

  MKDEP = gcc -MM 

This can made more platform-independent in the future... mkdep.pl
doesn't do quite the right thing for me, but I may not have used it
correctly.  I think it is set up for apache object file names (.lo).

Note that apr/build is a new directory for APR...

2) In the various Makefile.in files, do something like the patch
   below.  

I would prefer to start with the files used on Unix but simply post a
patch for the OS/2 and BeOS Makefile.in files, as I can't test them
and will surely mess up the sed scripts somehow.

Comments?

Index: Makefile.in
===================================================================
RCS file: /cvs/apache/apache-2.0/src/lib/apr/network_io/unix/Makefile.in,v
retrieving revision 1.19
diff -u -r1.19 Makefile.in
--- Makefile.in	2000/11/14 06:40:06	1.19
+++ Makefile.in	2000/11/14 23:53:21
@@ -1,3 +1,5 @@
+include ../../build/rules.mk
+
 #CFLAGS=$(OPTIM) $(CFLAGS1) $(EXTRA_CFLAGS)
 #LIBS=$(EXTRA_LIBS) $(LIBS1)
 #INCLUDES=$(INCLUDES1) $(INCLUDES0) $(EXTRA_INCLUDES)
@@ -45,51 +47,9 @@
 # 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: $(OSDIR)/: $$(OSDIR)/:g' \
-                   -e '1,$$s: $(DEFOSDIR)/: $$(DEFOSDIR)/:g' \
-	           -e '1,$$s: $(INCDIR)/: $$(INCDIR)/:g' Makefile.new \
-		> Makefile.in \
-	    && rm Makefile.new
+	cp Makefile Makefile.bak \
+	    && sed -ne '1,/^# DO NOT REMOVE/p' Makefile > Makefile.new \
+	    && $(MKDEP) $(INCLUDES) $(CFLAGS) *.c >> Makefile.new \
+	    && mv Makefile.new Makefile
 
 # DO NOT REMOVE
-inet_aton.o: inet_aton.c $(INCDIR)/apr_private.h
-poll.o: poll.c $(OSDIR)/networkio.h $(INCDIR)/apr.h \
- $(INCDIR)/apr_private.h $(INCDIR)/apr_network_io.h \
- $(INCDIR)/apr_general.h $(INCDIR)/apr_errno.h \
- $(INCDIR)/apr_file_io.h $(INCDIR)/apr_time.h \
- $(INCDIR)/apr_lib.h $(INCDIR)/apr_pools.h \
- $(INCDIR)/apr_thread_proc.h $(INCDIR)/apr_tables.h \
- $(OSDIR)/fileio.h
-sa_common.o: sa_common.c $(INCDIR)/apr.h
-sendrecv.o: sendrecv.c $(OSDIR)/networkio.h \
- $(INCDIR)/apr.h $(INCDIR)/apr_private.h \
- $(INCDIR)/apr_network_io.h $(INCDIR)/apr_general.h \
- $(INCDIR)/apr_errno.h $(INCDIR)/apr_file_io.h \
- $(INCDIR)/apr_time.h $(INCDIR)/apr_lib.h \
- $(INCDIR)/apr_pools.h $(INCDIR)/apr_thread_proc.h \
- $(INCDIR)/apr_tables.h
-sockaddr.o: sockaddr.c $(OSDIR)/networkio.h \
- $(INCDIR)/apr.h $(INCDIR)/apr_private.h \
- $(INCDIR)/apr_network_io.h $(INCDIR)/apr_general.h \
- $(INCDIR)/apr_errno.h $(INCDIR)/apr_file_io.h \
- $(INCDIR)/apr_time.h $(INCDIR)/apr_lib.h \
- $(INCDIR)/apr_pools.h $(INCDIR)/apr_thread_proc.h \
- $(INCDIR)/apr_tables.h $(INCDIR)/apr_strings.h sa_common.c
-sockets.o: sockets.c $(OSDIR)/networkio.h \
- $(INCDIR)/apr.h $(INCDIR)/apr_private.h \
- $(INCDIR)/apr_network_io.h $(INCDIR)/apr_general.h \
- $(INCDIR)/apr_errno.h $(INCDIR)/apr_file_io.h \
- $(INCDIR)/apr_time.h $(INCDIR)/apr_lib.h \
- $(INCDIR)/apr_pools.h $(INCDIR)/apr_thread_proc.h \
- $(INCDIR)/apr_tables.h $(INCDIR)/apr_portable.h \
- $(INCDIR)/apr_lock.h $(INCDIR)/apr_dso.h
-sockopt.o: sockopt.c $(OSDIR)/networkio.h \
- $(INCDIR)/apr.h $(INCDIR)/apr_private.h \
- $(INCDIR)/apr_network_io.h $(INCDIR)/apr_general.h \
- $(INCDIR)/apr_errno.h $(INCDIR)/apr_file_io.h \
- $(INCDIR)/apr_time.h $(INCDIR)/apr_lib.h \
- $(INCDIR)/apr_pools.h $(INCDIR)/apr_thread_proc.h \
- $(INCDIR)/apr_tables.h $(INCDIR)/apr_strings.h

Here is what the dependencies look like on my system after running "make
depend":

inet_aton.o: inet_aton.c ../../include/apr_private.h
poll.o: poll.c ../../include/arch/unix/networkio.h ../../include/apr.h \
 ../../include/apr_private.h ../../include/apr_network_io.h \
 ../../include/apr_general.h ../../include/apr_errno.h \
 ../../include/apr_file_io.h ../../include/apr_time.h \
 ../../include/apr_lib.h ../../include/apr_pools.h \
 ../../include/apr_thread_proc.h ../../include/apr_tables.h \
 ../../include/arch/unix/fileio.h
sa_common.o: sa_common.c ../../include/apr.h
sendrecv.o: sendrecv.c ../../include/arch/unix/networkio.h \
 ../../include/apr.h ../../include/apr_private.h \
 ../../include/apr_network_io.h ../../include/apr_general.h \
 ../../include/apr_errno.h ../../include/apr_file_io.h \
 ../../include/apr_time.h ../../include/apr_lib.h \
 ../../include/apr_pools.h ../../include/apr_thread_proc.h \
 ../../include/apr_tables.h ../../include/arch/unix/fileio.h
sockaddr.o: sockaddr.c ../../include/arch/unix/networkio.h \
 ../../include/apr.h ../../include/apr_private.h \
 ../../include/apr_network_io.h ../../include/apr_general.h \
 ../../include/apr_errno.h ../../include/apr_file_io.h \
 ../../include/apr_time.h ../../include/apr_lib.h \
 ../../include/apr_pools.h ../../include/apr_thread_proc.h \
 ../../include/apr_tables.h ../../include/apr_strings.h sa_common.c
(and so on)
-- 
Jeff Trawick | trawick@ibm.net | PGP public key at web site:
     http://www.geocities.com/SiliconValley/Park/9289/
          Born in Roswell... married an alien...

Mime
View raw message