[gimp] plug-ins: common: fix scripts to generate Makefile.am correctly



commit b462418dfcb720dc70c1e5e5e0e69128dff7c725
Author: Kristian Rietveld <kris loopnest org>
Date:   Wed Sep 7 22:05:09 2016 +0200

    plug-ins: common: fix scripts to generate Makefile.am correctly
    
    This complements the preceding commit "plug-ins: fix the build on OS X".

 plug-ins/common/mkgen.pl       |    9 +++++++++
 plug-ins/common/plugin-defs.pl |    2 +-
 2 files changed, 10 insertions(+), 1 deletions(-)
---
diff --git a/plug-ins/common/mkgen.pl b/plug-ins/common/mkgen.pl
index d612cd7..8a61139 100755
--- a/plug-ins/common/mkgen.pl
+++ b/plug-ins/common/mkgen.pl
@@ -185,6 +185,15 @@ ${makename}_CFLAGS = $cflagsvalue
 EOT
     }
 
+    if (exists $plugins{$_}->{cppflags}) {
+       my $cppflags = $plugins{$_}->{cppflags};
+
+       print MK <<EOT;
+
+${makename}_CPPFLAGS = $cppflags
+EOT
+    }
+
     my $deplib = "\$(RT_LIBS)\t\t\\\n\t\$(INTLLIBS)";
     if (exists $plugins{$_}->{libdep}) {
        my @lib = split(/:/, $plugins{$_}->{libdep});
diff --git a/plug-ins/common/plugin-defs.pl b/plug-ins/common/plugin-defs.pl
index 6183faf..8ec6073 100644
--- a/plug-ins/common/plugin-defs.pl
+++ b/plug-ins/common/plugin-defs.pl
@@ -90,6 +90,6 @@
     'unsharp-mask' => { ui => 1 },
     'van-gogh-lic' => { ui => 1 },
     'warp' => { ui => 1 },
-    'web-browser' => { ui => 1, ldflags => '$(framework_cocoa)', cflags => '$(xobjective_c)' },
+    'web-browser' => { ui => 1, ldflags => '$(framework_cocoa)', cppflags => '$(AM_CPPFLAGS) 
$(xobjective_c)' },
     'web-page' => { ui => 1, optional => 1, libs => 'WEBKIT_LIBS', cflags => 'WEBKIT_CFLAGS' }
 );


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]