Re: gnulib and automake

[John W. Eaton]

On 15-Nov-2009, Michael Goffioul wrote:

| It does not solve the problem, but I think it's one step in the
| good direction. Now, I don't see libocrinterp_la_CPPFLAGS being
| used when compiling oct-files, but -DOCTINTERP_DLL is still
| in the compilation command, through the following path (reverse):
| - .cc.lo rule
| - LTCXXCOMPILE
| - AM_CXXFLAGS
| - DLL_CXXDEFS

Is the following additional change enough to fix the problem?

I know that the handling of these flags needs some more cleanup...

jwe

diff --git a/common.mk b/common.mk
--- a/common.mk
+++ b/common.mk
@@ -109,7 +109,7 @@
 CPICFLAG = @CPICFLAG@
 XTRA_CFLAGS = @XTRA_CFLAGS@
 WARN_CFLAGS = @WARN_CFLAGS@
-ALL_CFLAGS = $(INCFLAGS) $(DLL_CDEFS) $(DEFS) $(XTRA_CFLAGS) $(WARN_CFLAGS) 
$(CFLAGS) $(PTHREAD_CFLAGS)
+ALL_CFLAGS = $(INCFLAGS) $(DEFS) $(XTRA_CFLAGS) $(WARN_CFLAGS) $(CFLAGS) 
$(PTHREAD_CFLAGS)
 BUG_CFLAGS = $(DEFS) $(XTRA_CFLAGS) $(WARN_CFLAGS) $(CFLAGS)
 
 BUILD_CC = @BUILD_CC@
@@ -132,7 +132,7 @@
 XTRA_CXXFLAGS = @XTRA_CXXFLAGS@
 WARN_CXXFLAGS = @WARN_CXXFLAGS@
 AM_CXXFLAGS = $(CONFIGURE_CXXFLAGS) \
-  $(INCFLAGS) $(DLL_CXXDEFS) $(DEFS) $(XTRA_CXXFLAGS) $(WARN_CXXFLAGS) 
$(CXXFLAGS) $(PTHREAD_CFLAGS)
+  $(INCFLAGS) $(DEFS) $(XTRA_CXXFLAGS) $(WARN_CXXFLAGS) $(CXXFLAGS) 
$(PTHREAD_CFLAGS)
 BUG_CXXFLAGS = $(DEFS) $(XTRA_CXXFLAGS) $(WARN_CXXFLAGS) $(CXXFLAGS)
 
 BUILD_CXX = @BUILD_CXX@