stdcxx-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Martin Sebor <se...@roguewave.com>
Subject Re: [PATCH] build process fails in TOPDIR if target (lib, etc.) specified (was Re: makefile patch)
Date Fri, 16 Dec 2005 18:26:31 GMT
Liviu Nicoara wrote:
> Addressing:
> 
> http://issues.apache.org/jira/browse/STDCXX-85
> 
> ChangeLog entry:
> 
> 2005-12-15  Liviu Nicoara  <nicoara@roguewave.com>
> 
         STDCXX-85
         ^^^^^^^^^
This needs to be up here for the Jira Subversion plugin to be able
to associate the change with the issue.

> 	* GNUMakefile: removed useless rules: all, builddir, added
> 	  rule lib, added variable INCDIR
> 	* etc/config/GNUmakefile.lib: invoked make config when
> 	  $(INCDIR)/config.h is missing at top of makedep macro
[...]
> Index: etc/config/makefile.rules
> ===================================================================
> --- etc/config/makefile.rules	(revision 357098)
> +++ etc/config/makefile.rules	(working copy)
> @@ -157,7 +157,10 @@
>  # move IBM xlC generated .u files to the respective .d files
>  
>  define makedep
> -    -@(if [ ! -f $@ ] ; then                                                 \
> +    -@(if [ ! -f $(INCDIR)/config.h ] ; then                                 \
> +           $(MAKE) -C$(INCDIR);                                              \
> +       fi;                                                                   \
> +       if [ ! -f $@ ] ; then                                                 \

Would it be possible to make this a dependency of the $(DEPENDDIR)/%.d
target below instead? I.e., have the .d files depend on config.h...

>             if [ ! -d $(DEPENDDIR) ]; then                                    \
>                 mkdir -p $(DEPENDDIR);                                        \
>             fi;                                                               \
> @@ -196,14 +199,12 @@
>  $(DEPENDDIR)/%.d: %$(AS_EXT)
>  	$(makedep)

...like so:

+  $(DEPENDDIR)/%.d: %$(AS_EXT) $(INCDIR)/config.h
+  	$(makedep)

Martin

Mime
View raw message