>From 05d8ecc52fd10e037eb83929a46811cd760e50bd Mon Sep 17 00:00:00 2001 From: "Arnel A. Borja" Date: Wed, 21 Dec 2011 07:04:19 +0800 Subject: [PATCH 5/6] project-wizard: Move PROJECT_CFLAGS to own line When adding PROJECT_CFLAGS to AM_CPPFLAGS in src/Makefile of templates, move it to its own line --- .../templates/anjuta-plugin/src/Makefile.am.tpl | 3 ++- .../templates/cpp/src/Makefile.am.tpl | 3 ++- .../templates/library/src/Makefile.am.tpl | 3 ++- .../templates/terminal/src/Makefile.am.tpl | 3 ++- .../templates/wxwin/src/Makefile.am.tpl | 3 ++- .../templates/xlib-dock/src/Makefile.am.tpl | 3 ++- .../templates/xlib/src/Makefile.am.tpl | 3 ++- 7 files changed, 14 insertions(+), 7 deletions(-) diff --git a/plugins/project-wizard/templates/anjuta-plugin/src/Makefile.am.tpl b/plugins/project-wizard/templates/anjuta-plugin/src/Makefile.am.tpl index 8ad3db3..ac3c1f8 100644 --- a/plugins/project-wizard/templates/anjuta-plugin/src/Makefile.am.tpl +++ b/plugins/project-wizard/templates/anjuta-plugin/src/Makefile.am.tpl @@ -39,7 +39,8 @@ AM_CPPFLAGS = \ -DANJUTA_UI_DIR=\"$(anjuta_ui_dir)\" \ -DPACKAGE_DATA_DIR=\"$(datadir)\" \ -DPACKAGE_SRC_DIR=\"$(srcdir)\" \ - $(LIBANJUTA_CFLAGS) [+IF (=(get "HavePackage") "1")+]$([+NameCUpper+]_CFLAGS)[+ENDIF+] + $(LIBANJUTA_CFLAGS)[+IF (=(get "HavePackage") "1")+] \ + $([+NameCUpper+]_CFLAGS)[+ENDIF+] # Where to install the plugin plugindir = $(anjuta_plugin_dir) diff --git a/plugins/project-wizard/templates/cpp/src/Makefile.am.tpl b/plugins/project-wizard/templates/cpp/src/Makefile.am.tpl index 7beab16..28f4f76 100644 --- a/plugins/project-wizard/templates/cpp/src/Makefile.am.tpl +++ b/plugins/project-wizard/templates/cpp/src/Makefile.am.tpl @@ -6,7 +6,8 @@ AM_CPPFLAGS = \ -DPACKAGE_LOCALE_DIR=\""$(localedir)"\" \ -DPACKAGE_SRC_DIR=\""$(srcdir)"\" \ - -DPACKAGE_DATA_DIR=\""$(pkgdatadir)"\" [+IF (=(get "HavePackage") "1")+]$([+NameCUpper+]_CFLAGS)[+ENDIF+] + -DPACKAGE_DATA_DIR=\""$(pkgdatadir)"\"[+IF (=(get "HavePackage") "1")+] \ + $([+NameCUpper+]_CFLAGS)[+ENDIF+] AM_CFLAGS =\ -Wall\ diff --git a/plugins/project-wizard/templates/library/src/Makefile.am.tpl b/plugins/project-wizard/templates/library/src/Makefile.am.tpl index 7d580cb..87c1b52 100644 --- a/plugins/project-wizard/templates/library/src/Makefile.am.tpl +++ b/plugins/project-wizard/templates/library/src/Makefile.am.tpl @@ -6,7 +6,8 @@ AM_CPPFLAGS = \ -DPACKAGE_LOCALE_DIR=\""$(localedir)"\" \ -DPACKAGE_SRC_DIR=\""$(srcdir)"\" \ - -DPACKAGE_DATA_DIR=\""$(pkgdatadir)"\" [+IF (=(get "HavePackage") "1")+]$([+NameCUpper+]_CFLAGS)[+ENDIF+] + -DPACKAGE_DATA_DIR=\""$(pkgdatadir)"\"[+IF (=(get "HavePackage") "1")+] \ + $([+NameCUpper+]_CFLAGS)[+ENDIF+] AM_CFLAGS =\ -Wall\ diff --git a/plugins/project-wizard/templates/terminal/src/Makefile.am.tpl b/plugins/project-wizard/templates/terminal/src/Makefile.am.tpl index 2661f54..7a239dc 100644 --- a/plugins/project-wizard/templates/terminal/src/Makefile.am.tpl +++ b/plugins/project-wizard/templates/terminal/src/Makefile.am.tpl @@ -6,7 +6,8 @@ AM_CPPFLAGS = \ -DPACKAGE_LOCALE_DIR=\""$(localedir)"\" \ -DPACKAGE_SRC_DIR=\""$(srcdir)"\" \ - -DPACKAGE_DATA_DIR=\""$(pkgdatadir)"\" [+IF (=(get "HavePackage") "1")+]$([+NameCUpper+]_CFLAGS)[+ENDIF+] + -DPACKAGE_DATA_DIR=\""$(pkgdatadir)"\"[+IF (=(get "HavePackage") "1")+] \ + $([+NameCUpper+]_CFLAGS)[+ENDIF+] AM_CFLAGS =\ -Wall\ diff --git a/plugins/project-wizard/templates/wxwin/src/Makefile.am.tpl b/plugins/project-wizard/templates/wxwin/src/Makefile.am.tpl index 325cad0..c5dda11 100644 --- a/plugins/project-wizard/templates/wxwin/src/Makefile.am.tpl +++ b/plugins/project-wizard/templates/wxwin/src/Makefile.am.tpl @@ -7,7 +7,8 @@ AM_CPPFLAGS = \ $(WX_CXXFLAGS) \ -DPACKAGE_LOCALE_DIR=\""$(localedir)"\" \ -DPACKAGE_SRC_DIR=\""$(srcdir)"\" \ - -DPACKAGE_DATA_DIR=\""$(pkgdatadir)"\" [+IF (=(get "HavePackage") "1")+]$([+NameCUpper+]_CFLAGS)[+ENDIF+] + -DPACKAGE_DATA_DIR=\""$(pkgdatadir)"\"[+IF (=(get "HavePackage") "1")+] \ + $([+NameCUpper+]_CFLAGS)[+ENDIF+] AM_CFLAGS =\ -Wall \ diff --git a/plugins/project-wizard/templates/xlib-dock/src/Makefile.am.tpl b/plugins/project-wizard/templates/xlib-dock/src/Makefile.am.tpl index 3a71757..55494ca 100644 --- a/plugins/project-wizard/templates/xlib-dock/src/Makefile.am.tpl +++ b/plugins/project-wizard/templates/xlib-dock/src/Makefile.am.tpl @@ -6,7 +6,8 @@ AM_CPPFLAGS = \ -DPACKAGE_LOCALE_DIR=\""$(localedir)"\" \ -DPACKAGE_SRC_DIR=\""$(srcdir)"\" \ - -DPACKAGE_DATA_DIR=\""$(pkgdatadir)"\" [+IF (=(get "HavePackage") "1")+]$([+NameCUpper+]_CFLAGS)[+ENDIF+] + -DPACKAGE_DATA_DIR=\""$(pkgdatadir)"\"[+IF (=(get "HavePackage") "1")+] \ + $([+NameCUpper+]_CFLAGS)[+ENDIF+] AM_CFLAGS =\ -Wall\ diff --git a/plugins/project-wizard/templates/xlib/src/Makefile.am.tpl b/plugins/project-wizard/templates/xlib/src/Makefile.am.tpl index 6fe27a1..32009ce 100644 --- a/plugins/project-wizard/templates/xlib/src/Makefile.am.tpl +++ b/plugins/project-wizard/templates/xlib/src/Makefile.am.tpl @@ -6,7 +6,8 @@ AM_CPPFLAGS = \ -DPACKAGE_LOCALE_DIR=\""$(localedir)"\" \ -DPACKAGE_SRC_DIR=\""$(srcdir)"\" \ - -DPACKAGE_DATA_DIR=\""$(pkgdatadir)"\" [+IF (=(get "HavePackage") "1")+]$([+NameCUpper+]_CFLAGS)[+ENDIF+] + -DPACKAGE_DATA_DIR=\""$(pkgdatadir)"\"[+IF (=(get "HavePackage") "1")+] \ + $([+NameCUpper+]_CFLAGS)[+ENDIF+] AM_CFLAGS =\ -Wall\ -- 1.7.5.4