httpd-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From c...@decus.org (Rodent of Unusual Size)
Subject [PATCH] (proto) (was: Re: Putting modules in their own subdirectories)
Date Sat, 08 Mar 1997 13:19:38 GMT
>From the fingers of Randy Terbush flowed the following:
>
>For the most part, I think this has been done. There is a bit of 
>clunkyness which last I looked required mod_proxy to be compiled in 
>order to get the compile to check the 'modules' subdirectory. Other 
>than that, "it just works".

    Blimey, I was tired yesterday!  Somehow I *completely* missed the
    second sentence above.  I see now I basically said the same
    thing.  Foo.  Definitely some cranial wind yesterday.  {sigh}

    Anyway, here is a patch to Makefile.tmpl and Configure that should
    allow this to work w/o requiring mod_proxy.  (It works well in my
    tests, but after yesterday who knows..)  There are three things
    about it that trouble me slightly, though:

     o it puts stuff into src/Makefile *after* the "end of
       Configure-generated stuff" comment
     o to add a module, you need to update src/Configuration to include
       it, AND add it to src/modules/Makefile (that's not new)
     o I couldn't figure out how to keep from doing unnecessary (and
       wrong!) steps w/o putting the "; @/bin/true" on the module
       dependency lines.  If I omitted something like that, make would
       try to build the objects twice, once from the wrong environment,
       and/or do the ld phase even if nothing had changed

    The first is easily fixed (change the comments), but changing the
    last two stretches my knowledge of make.  I *am* documenting the
    second item in the README file accompanying the template module
    stuff.

    I'm also not certain of the portability of /bin/true and the "~"
    construct for awk - I only have OSF/1 available to me.

    #ken    :-P}

Index: Makefile.tmpl
===================================================================
RCS file: /usr/users/coar/myApache/repository/apache/src/Makefile.tmpl,v
retrieving revision 1.41
diff -c -r1.41 Makefile.tmpl
*** 1.41	1997/02/25 20:56:38
--- Makefile.tmpl	1997/03/07 22:11:23
***************
*** 33,39 ****
  regex/libregex.a:
  	(cd regex; $(MAKE) lib CC=$(CC) AUX_CFLAGS='$(CFLAGS)' RANLIB='$(RANLIB)')
  
! modules/proxy/libproxy.a:
  	(cd modules; \
  	$(MAKE) CC=$(CC) AUX_CFLAGS='$(CFLAGS)' RANLIB='$(RANLIB)')
  
--- 33,39 ----
  regex/libregex.a:
  	(cd regex; $(MAKE) lib CC=$(CC) AUX_CFLAGS='$(CFLAGS)' RANLIB='$(RANLIB)')
  
! modules/last-built:
  	(cd modules; \
  	$(MAKE) CC=$(CC) AUX_CFLAGS='$(CFLAGS)' RANLIB='$(RANLIB)')
  
Index: Configure
===================================================================
RCS file: /usr/users/coar/myApache/repository/apache/src/Configure,v
retrieving revision 1.81
diff -c -r1.81 Configure
*** 1.81	1997/02/25 21:04:41
--- Configure	1997/03/07 22:03:13
***************
*** 567,570 ****
--- 567,573 ----
  # Now (finish) creating the makefiles
  cat Makefile.config >> Makefile
  cat "$makefile_tmpl" >> Makefile
+ awk >>Makefile <$tmpfile \
+    '$3 ~ "modules/" { printf "%s: modules/last-built ; @/bin/true\n", $3}'
  cat Makefile.config ../support/Makefile.tmpl > ../support/Makefile

Mime
View raw message