apr-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Joe Orton <...@manyfish.co.uk>
Subject Re: cvs commit: apr-util/xml Makefile.in
Date Thu, 05 Feb 2004 11:29:59 GMT
On Thu, Feb 05, 2004 at 10:16:27AM -0000, Greg Stein wrote:
> gstein      2004/02/05 02:16:27
> 
>   Modified:    .        .cvsignore Makefile.in buildconf configure.in
>                build    apr_rules.mk.in
>                .        .cvsignore Makefile.in buildconf configure.in
>   Added:       .        build.conf
>                build    gen-build.py
>                .        build.conf
>                build    gen-uri-delims.py
>   Removed:     atomic/os390 Makefile.in
>                atomic/unix Makefile.in
>                build    Makefile.in
>                dso/aix  Makefile.in

Very nice! It doesn't seem to work however :) The dependencies are
missing "include/" in the header filenames in build-outputs.mk:

atomic/unix/apr_atomic.lo: atomic/unix/apr_atomic.c apr.h apr_general.h

something like this fixes it for me (and also the HEADERS definitions to
fix exports.c generation in a VPATH build), maybe there is a prettier
way to do it:

Index: build/gen-build.py
===================================================================
RCS file: /home/cvs/apr/build/gen-build.py,v
retrieving revision 1.1
diff -u -r1.1 gen-build.py
--- build/gen-build.py	5 Feb 2004 10:16:21 -0000	1.1
+++ build/gen-build.py	5 Feb 2004 11:26:48 -0000
@@ -50,10 +50,10 @@
     for hdr in deps.keys():
       deps.update(h_deps.get(hdr, {}))
 
-    f.write('%s: %s %s\n' % (obj, file, string.join(deps.keys(), ' ')))
+    f.write('%s: %s include/%s\n' % (obj, file, string.join(deps.keys(), ' include/')))
 
   f.write('\nOBJECTS = %s\n\n' % string.join(objects))
-  f.write('HEADERS = %s\n\n' % string.join(headers))
+  f.write('HEADERS = $(top_srcdir)/%s\n\n' % string.join(headers, ' $(top_srcdir)/'))
   f.write('SOURCE_DIRS = %s\n\n' % string.join(dirs.keys()))
 
 

Mime
View raw message