[gnome-maps/wip/routing: 44/45] Makefiles: consistent indentation

From: Mattias Bengtsson <mattiasb src gnome org>
To: commits-list gnome org
Cc:
Subject: [gnome-maps/wip/routing: 44/45] Makefiles: consistent indentation
Date: Sat, 7 Sep 2013 09:44:12 +0000 (UTC)
commit ba6396fc3ecd1a4d447b14a2ef1d9d3140bcf3c9
Author: Mattias Bengtsson <mattias jc bengtsson gmail com>
Date:   Sat Sep 7 11:25:23 2013 +0200

    Makefiles: consistent indentation
    
    Move to four space indentation instead of tabs and add modelines to
    prevent inconsistencies to happen again.

 Makefile.am            |    3 +
 data/Makefile.am       |   19 +++++----
 data/icons/Makefile.am |  101 ++++++++++++++++++++++++-----------------------
 src/Makefile-js.am     |   53 +++++++++++++------------
 src/Makefile.am        |    9 +++-
 5 files changed, 100 insertions(+), 85 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index ce68989..403792b 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,3 +1,6 @@
+# -*- indent-tabs-mode: nil; tab-width: 4 -*-
+# vim: set et ts=4 sw=4: */
+
 ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS}
 
 SUBDIRS = src data po
diff --git a/data/Makefile.am b/data/Makefile.am
index c3eee1b..bfc911b 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -1,9 +1,12 @@
+# -*- indent-tabs-mode: nil; tab-width: 4 -*-
+# vim: set et ts=4 sw=4: */
+
 SUBDIRS = icons
 
 # The desktop files
 desktopdir = $(datadir)/applications
 desktop_DATA = \
-       gnome-maps.desktop
+    gnome-maps.desktop
 @INTLTOOL_DESKTOP_RULE@
 
 gsettingsschema_in_files = org.gnome.maps.gschema.xml.in
@@ -18,13 +21,13 @@ appdata_in_file = gnome-maps.appdata.xml.in
 appdata_DATA = $(appdata_in_file:.xml.in=.xml)
 @INTLTOOL_XML_RULE@
 
-EXTRA_DIST= \
-    gnome-maps.desktop \
-    $(desktop_in_files) \
-    $(appdata_in_file) \
+EXTRA_DIST=                       \
+    gnome-maps.desktop            \
+    $(desktop_in_files)           \
+    $(appdata_in_file)            \
     $(gsettingsschema_in_files)
 
-CLEANFILES = \
-    $(desktop_DATA) \
-    $(appdata_DATA) \
+CLEANFILES =                      \
+    $(desktop_DATA)               \
+    $(appdata_DATA)               \
     $(gsettings_SCHEMAS)
diff --git a/data/icons/Makefile.am b/data/icons/Makefile.am
index 55493aa..717fd4a 100644
--- a/data/icons/Makefile.am
+++ b/data/icons/Makefile.am
@@ -1,69 +1,72 @@
+# -*- indent-tabs-mode: nil; tab-width: 4 -*-
+# vim: set et ts=4 sw=4: */
+
 NULL =
 
-public_icons_themes =                          \
-       hicolor                                 \
-       $(NULL)
+public_icons_themes =                      \
+    hicolor                                \
+    $(NULL)
 
-public_icons =                                 \
-       hicolor_apps_16x16_gnome-maps.png       \
-       hicolor_apps_22x22_gnome-maps.png       \
-       hicolor_apps_24x24_gnome-maps.png       \
-       hicolor_apps_32x32_gnome-maps.png       \
-       hicolor_apps_48x48_gnome-maps.png       \
-       hicolor_apps_256x256_gnome-maps.png     \
-       $(NULL)
+public_icons =                             \
+    hicolor_apps_16x16_gnome-maps.png      \
+    hicolor_apps_22x22_gnome-maps.png      \
+    hicolor_apps_24x24_gnome-maps.png      \
+    hicolor_apps_32x32_gnome-maps.png      \
+    hicolor_apps_48x48_gnome-maps.png      \
+    hicolor_apps_256x256_gnome-maps.png    \
+    $(NULL)
 
 imagesdir = $(datadir)/gnome-maps/pixmaps
-images_DATA =                                   \
-       bubble.svg                              \
-       pin.svg                                 \
-        $(NULL)
+images_DATA =                              \
+    bubble.svg                             \
+    pin.svg                                \
+    $(NULL)
 
-noinst_DATA =                                  \
-       gnome-maps.svg                          \
-       $(NULL)
+noinst_DATA =                              \
+    gnome-maps.svg                         \
+    $(NULL)
 
-EXTRA_DIST =                                   \
-       $(public_icons)                         \
-       $(images_DATA)                          \
-       gnome-maps.svg                          \
-       $(NULL)
+EXTRA_DIST =                               \
+    $(public_icons)                        \
+    $(images_DATA)                         \
+    gnome-maps.svg                         \
+    $(NULL)
 
 ###############################################################################
 
 gtk_update_icon_cache = gtk-update-icon-cache -f -t
 
 update-icon-cache:
-       @-if test -z "$(DESTDIR)"; then \
-               echo "Updating Gtk icon cache."; \
-               for theme in $(public_icons_themes); do \
-                       $(gtk_update_icon_cache) $(datadir)/icons/$$theme; \
-               done; \
-       else \
-               echo "*** Icon cache not updated.  After (un)install, run this:"; \
-               for theme in $(public_icons_themes); do \
-                       echo "***   $(gtk_update_icon_cache) $(datadir)/icons/$$theme"; \
-               done; \
-       fi
+    @-if test -z "$(DESTDIR)"; then \
+        echo "Updating Gtk icon cache."; \
+        for theme in $(public_icons_themes); do \
+            $(gtk_update_icon_cache) $(datadir)/icons/$$theme; \
+        done; \
+    else \
+        echo "*** Icon cache not updated.  After (un)install, run this:"; \
+        for theme in $(public_icons_themes); do \
+            echo "***   $(gtk_update_icon_cache) $(datadir)/icons/$$theme"; \
+        done; \
+    fi
 
 install-icons:
-       for icon in $(public_icons); do \
-               THEME=`echo $$icon | cut -d_ -f1`; \
-               CONTEXT=`echo $$icon | cut -d_ -f2`; \
-               SIZE=`echo $$icon | cut -d_ -f3`; \
-               ICONFILE=`echo $$icon | cut -d_ -f4`; \
-               mkdir -p $(DESTDIR)$(datadir)/icons/$$THEME/$$SIZE/$$CONTEXT; \
-               $(INSTALL_DATA) $(srcdir)/$$icon 
$(DESTDIR)$(datadir)/icons/$$THEME/$$SIZE/$$CONTEXT/$$ICONFILE; \
-       done
+    for icon in $(public_icons); do \
+        THEME=`echo $$icon | cut -d_ -f1`; \
+        CONTEXT=`echo $$icon | cut -d_ -f2`; \
+        SIZE=`echo $$icon | cut -d_ -f3`; \
+        ICONFILE=`echo $$icon | cut -d_ -f4`; \
+        mkdir -p $(DESTDIR)$(datadir)/icons/$$THEME/$$SIZE/$$CONTEXT; \
+        $(INSTALL_DATA) $(srcdir)/$$icon $(DESTDIR)$(datadir)/icons/$$THEME/$$SIZE/$$CONTEXT/$$ICONFILE; \
+    done
 
 uninstall-icons:
-       -for icon in $(public_icons); do \
-               THEME=`echo $$icon | cut -d_ -f1`; \
-               CONTEXT=`echo $$icon | cut -d_ -f2`; \
-               SIZE=`echo $$icon | cut -d_ -f3`; \
-               ICONFILE=`echo $$icon | cut -d_ -f4`; \
-               rm -f $(DESTDIR)$(datadir)/icons/$$THEME/$$SIZE/$$CONTEXT/$$ICONFILE; \
-       done
+    -for icon in $(public_icons); do \
+        THEME=`echo $$icon | cut -d_ -f1`; \
+        CONTEXT=`echo $$icon | cut -d_ -f2`; \
+        SIZE=`echo $$icon | cut -d_ -f3`; \
+        ICONFILE=`echo $$icon | cut -d_ -f4`; \
+        rm -f $(DESTDIR)$(datadir)/icons/$$THEME/$$SIZE/$$CONTEXT/$$ICONFILE; \
+    done
 
 install-data-local: install-icons
 install-data-hook: update-icon-cache
diff --git a/src/Makefile-js.am b/src/Makefile-js.am
index e53e269..afd6d2f 100644
--- a/src/Makefile-js.am
+++ b/src/Makefile-js.am
@@ -1,39 +1,42 @@
+# -*- indent-tabs-mode: nil; tab-width: 4 -*-
+# vim: set et ts=4 sw=4: */
+
 jsdir = $(pkgdatadir)/js/
-dist_js_DATA = \
-    application.js \
-       http.js \
-    main.js \
-    mainWindow.js \
-    mapLocation.js \
-    mapView.js \
-    path.js \
-       polyline.js \
-       route.js \
-       routeService.js \
-    sidebar.js \
-    utils.js \
-    userLocation.js \
-    geoclue.js \
-    zoomControl.js \
-    searchPopup.js \
+dist_js_DATA =          \
+    application.js      \
+    http.js             \
+    main.js             \
+    mainWindow.js       \
+    mapLocation.js      \
+    mapView.js          \
+    path.js             \
+    polyline.js         \
+    route.js            \
+    routeService.js     \
+    sidebar.js          \
+    utils.js            \
+    userLocation.js     \
+    geoclue.js          \
+    zoomControl.js      \
+    searchPopup.js      \
     contextMenu.js
 
-BUILT_SOURCES += \
-    path.js \
+BUILT_SOURCES +=        \
+    path.js             \
     config.js
 
 path.js: Makefile path.js.in
-       $(AM_V_GEN) $(do_subst) $(srcdir)/path.js.in > $@
+    $(AM_V_GEN) $(do_subst) $(srcdir)/path.js.in > $@
 config.js: Makefile config.js.in
-       $(AM_V_GEN) $(do_subst) $(srcdir)/config.js.in > $@
+    $(AM_V_GEN) $(do_subst) $(srcdir)/config.js.in > $@
 
-nodist_js_DATA = \
-    path.js \
+nodist_js_DATA =        \
+    path.js             \
     config.js
 
 CLEANFILES += \
     $(BUILT_SOURCES)
 
-EXTRA_DIST += \
-    path.js.in \
+EXTRA_DIST +=           \
+    path.js.in          \
     config.js.in
diff --git a/src/Makefile.am b/src/Makefile.am
index b5dbbc0..00cce7a 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,3 +1,6 @@
+# -*- indent-tabs-mode: nil; tab-width: 4 -*-
+# vim: set et ts=4 sw=4: */
+
 BUILT_SOURCES =
 EXTRA_DIST =
 CLEANFILES =
@@ -22,7 +25,7 @@ include Makefile-js.am
 
 resource_files = $(shell $(GLIB_COMPILE_RESOURCES) --sourcedir=$(srcdir) --generate-dependencies 
$(srcdir)/gnome-maps.gresource.xml)
 gnome-maps.gresource: gnome-maps.gresource.xml $(resource_files)
-       $(AM_V_GEN) $(GLIB_COMPILE_RESOURCES) --target=$@ --sourcedir=$(srcdir) $<
+    $(AM_V_GEN) $(GLIB_COMPILE_RESOURCES) --target=$@ --sourcedir=$(srcdir) $<
 EXTRA_DIST += gnome-maps.gresource.xml $(resource_files)
 
 resourcedir = $(pkgdatadir)
@@ -33,8 +36,8 @@ CLEANFILES += gnome-maps.gresource
 bin_SCRIPTS = gnome-maps
 
 gnome-maps: gnome-maps.in
-       $(AM_V_GEN) $(do_subst) $< > $@
-       chmod +x $@
+    $(AM_V_GEN) $(do_subst) $< > $@
+    chmod +x $@
 
 CLEANFILES += \
     gnome-maps
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]