[gnome-builder/gnome-builder-3-20] autotools-templates: add src/Makefile.am for empty template



commit 28e46767ffb2e3f34dfba16dc82975c93e02f5c9
Author: Raunaq Abhyankar <raunaq abhyankar gmail com>
Date:   Wed May 11 22:22:26 2016 +0530

    autotools-templates: add src/Makefile.am for empty template
    
    This adds an empty src/Makefile.am for the empty autotools template.
    
    https://bugzilla.gnome.org/show_bug.cgi?id=766240

 .../autotools_templates/__init__.py                |    3 +++
 .../autotools_templates/resources/Makefile.am      |   10 +---------
 .../autotools_templates/resources/configure.ac     |    3 ---
 .../resources/src/Makefile.empty                   |    1 +
 4 files changed, 5 insertions(+), 12 deletions(-)
---
diff --git a/plugins/autotools-templates/autotools_templates/__init__.py 
b/plugins/autotools-templates/autotools_templates/__init__.py
index dea4e4e..cf6f7eb 100644
--- a/plugins/autotools-templates/autotools_templates/__init__.py
+++ b/plugins/autotools-templates/autotools_templates/__init__.py
@@ -227,3 +227,6 @@ class EmptyProjectTemplate(AutotoolsTemplate):
             ['C', 'C++', 'Vala']
          )
 
+    def prepare_files(self, files):
+        files['resources/src/Makefile.empty'] = 'src/Makefile.am'
+
diff --git a/plugins/autotools-templates/autotools_templates/resources/Makefile.am 
b/plugins/autotools-templates/autotools_templates/resources/Makefile.am
index 5bffab3..867d9aa 100644
--- a/plugins/autotools-templates/autotools_templates/resources/Makefile.am
+++ b/plugins/autotools-templates/autotools_templates/resources/Makefile.am
@@ -1,12 +1,4 @@
-SUBDIRS = \
-       data \
-{{if enable_i18n}}
-       po \
-{{end}}
-{{if template != "empty"}}
-       src \
-{{end}}
-       $(NULL)
+SUBDIRS = data{{if enable_i18n}} po{{end}} src
 
 EXTRA_DIST = AUTHORS
 
diff --git a/plugins/autotools-templates/autotools_templates/resources/configure.ac 
b/plugins/autotools-templates/autotools_templates/resources/configure.ac
index 6d019b1..94c3b96 100644
--- a/plugins/autotools-templates/autotools_templates/resources/configure.ac
+++ b/plugins/autotools-templates/autotools_templates/resources/configure.ac
@@ -131,9 +131,7 @@ dnl ***********************************************************************
 AC_CONFIG_FILES([
        Makefile
 
-{{if template != "empty"}}
        src/Makefile
-{{end}}
 {{if template == "shared-library"}}
 {{if language != "vala"}}
        src/{{prefix}}-version.h
@@ -152,7 +150,6 @@ AC_CONFIG_FILES([
 [API_VERSION='$API_VERSION'])
 AC_OUTPUT
 
-
 echo ""
 echo " ${PACKAGE} - ${VERSION}"
 echo ""
diff --git a/plugins/autotools-templates/autotools_templates/resources/src/Makefile.empty 
b/plugins/autotools-templates/autotools_templates/resources/src/Makefile.empty
new file mode 100644
index 0000000..ae44c94
--- /dev/null
+++ b/plugins/autotools-templates/autotools_templates/resources/src/Makefile.empty
@@ -0,0 +1 @@
+-include $(top_srcdir)/git.mk


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