>From eabf1150e8dd5fa7c71e433223a844fb536f2024 Mon Sep 17 00:00:00 2001 From: "Arnel A. Borja" Date: Sat, 24 Dec 2011 13:36:38 +0800 Subject: [PATCH 3/4] project-wizard: check HavePackage before adding PROJECT_CFLAGS --- .../templates/gtk/src/Makefile.am.tpl | 4 ++-- .../templates/gtkapplication/src/Makefile.am.tpl | 4 ++-- .../templates/gtkmm/src/Makefile.am.tpl | 4 ++-- .../templates/vala-gtk/src/Makefile.am.tpl | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/plugins/project-wizard/templates/gtk/src/Makefile.am.tpl b/plugins/project-wizard/templates/gtk/src/Makefile.am.tpl index 0741903..d01c41c 100644 --- a/plugins/project-wizard/templates/gtk/src/Makefile.am.tpl +++ b/plugins/project-wizard/templates/gtk/src/Makefile.am.tpl @@ -11,8 +11,8 @@ ui_DATA = [+NameHLower+].ui AM_CPPFLAGS = \ -DPACKAGE_LOCALE_DIR=\""$(localedir)"\" \ -DPACKAGE_SRC_DIR=\""$(srcdir)"\" \ - -DPACKAGE_DATA_DIR=\""$(pkgdatadir)"\" \ - $([+NameCUpper+]_CFLAGS) + -DPACKAGE_DATA_DIR=\""$(pkgdatadir)"\"[+IF (=(get "HavePackage") "1")+] \ + $([+NameCUpper+]_CFLAGS)[+ENDIF+] AM_CFLAGS =\ -Wall\ diff --git a/plugins/project-wizard/templates/gtkapplication/src/Makefile.am.tpl b/plugins/project-wizard/templates/gtkapplication/src/Makefile.am.tpl index 5a59ded..fbd5dcf 100644 --- a/plugins/project-wizard/templates/gtkapplication/src/Makefile.am.tpl +++ b/plugins/project-wizard/templates/gtkapplication/src/Makefile.am.tpl @@ -11,8 +11,8 @@ ui_DATA = [+NameHLower+].ui AM_CPPFLAGS = \ -DPACKAGE_LOCALE_DIR=\""$(localedir)"\" \ -DPACKAGE_SRC_DIR=\""$(srcdir)"\" \ - -DPACKAGE_DATA_DIR=\""$(pkgdatadir)"\" \ - $([+NameCUpper+]_CFLAGS) + -DPACKAGE_DATA_DIR=\""$(pkgdatadir)"\"[+IF (=(get "HavePackage") "1")+] \ + $([+NameCUpper+]_CFLAGS)[+ENDIF+] AM_CFLAGS =\ -Wall\ diff --git a/plugins/project-wizard/templates/gtkmm/src/Makefile.am.tpl b/plugins/project-wizard/templates/gtkmm/src/Makefile.am.tpl index 02846ea..079c1a8 100644 --- a/plugins/project-wizard/templates/gtkmm/src/Makefile.am.tpl +++ b/plugins/project-wizard/templates/gtkmm/src/Makefile.am.tpl @@ -11,8 +11,8 @@ ui_DATA = [+NameHLower+].ui AM_CPPFLAGS = \ -DPACKAGE_LOCALE_DIR=\""$(localedir)"\" \ -DPACKAGE_SRC_DIR=\""$(srcdir)"\" \ - -DPACKAGE_DATA_DIR=\""$(pkgdatadir)"\" \ - $([+NameCUpper+]_CFLAGS) + -DPACKAGE_DATA_DIR=\""$(pkgdatadir)"\"[+IF (=(get "HavePackage") "1")+] \ + $([+NameCUpper+]_CFLAGS)[+ENDIF+] AM_CFLAGS =\ -Wall\ diff --git a/plugins/project-wizard/templates/vala-gtk/src/Makefile.am.tpl b/plugins/project-wizard/templates/vala-gtk/src/Makefile.am.tpl index dab5bf0..b8f89f9 100644 --- a/plugins/project-wizard/templates/vala-gtk/src/Makefile.am.tpl +++ b/plugins/project-wizard/templates/vala-gtk/src/Makefile.am.tpl @@ -11,8 +11,8 @@ ui_DATA = [+NameHLower+].ui AM_CPPFLAGS = \ -DPACKAGE_LOCALE_DIR=\""$(localedir)"\" \ -DPACKAGE_SRC_DIR=\""$(srcdir)"\" \ - -DPACKAGE_DATA_DIR=\""$(pkgdatadir)"\" \ - $([+NameCUpper+]_CFLAGS) + -DPACKAGE_DATA_DIR=\""$(pkgdatadir)"\"[+IF (=(get "HavePackage") "1")+] \ + $([+NameCUpper+]_CFLAGS)[+ENDIF+] AM_CFLAGS =\ -Wall\ -- 1.7.5.4