[gnome-maps/wip/binary: 1/4] Makefile: Whitespace cleanup
- From: Mattias Bengtsson <mattiasb src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-maps/wip/binary: 1/4] Makefile: Whitespace cleanup
- Date: Wed, 22 Jan 2014 06:22:30 +0000 (UTC)
commit 273781a85672f6760f1c6c963e14c69b76619467
Author: Mattias Bengtsson <mattias jc bengtsson gmail com>
Date: Wed Jan 22 05:43:59 2014 +0100
Makefile: Whitespace cleanup
Indent our Makefiles using only tabs with width 8.
Also keep all escaped new-lines aligned on column 72. 72 might seem
like a high number but it ensures that the \'s will keep being aligned
without adding realignment noise to patches in the future.
https://bugzilla.gnome.org/show_bug.cgi?id=722338
src/Makefile-js.am | 54 ++++++++++++++++++++++++++--------------------------
src/Makefile.am | 43 ++++++++++++++++++++++++-----------------
2 files changed, 52 insertions(+), 45 deletions(-)
---
diff --git a/src/Makefile-js.am b/src/Makefile-js.am
index a7055f5..2daa45b 100644
--- a/src/Makefile-js.am
+++ b/src/Makefile-js.am
@@ -1,37 +1,37 @@
jsdir = $(pkgdatadir)/js/
-dist_js_DATA = \
- application.js \
- main.js \
- mainWindow.js \
- mapLocation.js \
- mapView.js \
- path.js \
- sidebar.js \
- settings.js \
- utils.js \
- userLocation.js \
- geoclue.js \
- zoomControl.js \
- searchPopup.js \
- contextMenu.js \
- placeStore.js
+dist_js_DATA = \
+ application.js \
+ main.js \
+ mainWindow.js \
+ mapLocation.js \
+ mapView.js \
+ path.js \
+ sidebar.js \
+ settings.js \
+ utils.js \
+ userLocation.js \
+ geoclue.js \
+ zoomControl.js \
+ searchPopup.js \
+ contextMenu.js \
+ placeStore.js
-BUILT_SOURCES += \
- path.js \
- config.js
+BUILT_SOURCES += \
+ path.js \
+ config.js
path.js: Makefile 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 > $@
-nodist_js_DATA = \
- path.js \
- config.js
+nodist_js_DATA = \
+ path.js \
+ config.js
-CLEANFILES += \
- $(BUILT_SOURCES)
+CLEANFILES += \
+ $(BUILT_SOURCES)
-EXTRA_DIST += \
- path.js.in \
- config.js.in
+EXTRA_DIST += \
+ path.js.in \
+ config.js.in
diff --git a/src/Makefile.am b/src/Makefile.am
index b5dbbc0..94bb834 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -4,25 +4,32 @@ CLEANFILES =
# convenience command for doing Makefile variable substitutions in non-Makefile
# files (scripts, service files, etc.)
-do_subst = sed -e 's|@abs_top_srcdir[ ]|$(abs_top_srcdir)|g' \
- -e 's|@abs_top_builddir[ ]|$(abs_top_builddir)|g' \
- -e 's|@localedir[ ]|$(localedir)|g' \
- -e 's|@bindir[ ]|$(bindir)|g' \
- -e 's|@libdir[ ]|$(libdir)|g' \
- -e 's|@libexecdir[ ]|$(libexecdir)|g' \
- -e 's|@pkglibdir[ ]|$(pkglibdir)|g' \
- -e 's|@pkgdatadir[ ]|$(pkgdatadir)|g' \
- -e 's|@GJS_CONSOLE[ ]|$(GJS_CONSOLE)|g' \
- -e 's|@PACKAGE_NAME[ ]|$(PACKAGE_NAME)|g' \
- -e 's|@PACKAGE_VERSION[ ]|$(PACKAGE_VERSION)|g' \
- -e 's|@GETTEXT_PACKAGE[ ]|$(GETTEXT_PACKAGE)|g'
+do_subst = sed -e 's|@abs_top_srcdir[ ]|$(abs_top_srcdir)|g' \
+ -e 's|@abs_top_builddir[ ]|$(abs_top_builddir)|g' \
+ -e 's|@localedir[ ]|$(localedir)|g' \
+ -e 's|@bindir[ ]|$(bindir)|g' \
+ -e 's|@libdir[ ]|$(libdir)|g' \
+ -e 's|@libexecdir[ ]|$(libexecdir)|g' \
+ -e 's|@pkglibdir[ ]|$(pkglibdir)|g' \
+ -e 's|@pkgdatadir[ ]|$(pkgdatadir)|g' \
+ -e 's|@GJS_CONSOLE[ ]|$(GJS_CONSOLE)|g' \
+ -e 's|@PACKAGE_NAME[ ]|$(PACKAGE_NAME)|g' \
+ -e 's|@PACKAGE_VERSION[ ]|$(PACKAGE_VERSION)|g' \
+ -e 's|@GETTEXT_PACKAGE[ ]|$(GETTEXT_PACKAGE)|g'
include $(INTROSPECTION_MAKEFILE)
include Makefile-js.am
-resource_files = $(shell $(GLIB_COMPILE_RESOURCES) --sourcedir=$(srcdir) --generate-dependencies
$(srcdir)/gnome-maps.gresource.xml)
+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)
@@ -36,7 +43,7 @@ gnome-maps: gnome-maps.in
$(AM_V_GEN) $(do_subst) $< > $@
chmod +x $@
-CLEANFILES += \
- gnome-maps
-EXTRA_DIST += \
- gnome-maps.in
+CLEANFILES += \
+ gnome-maps
+EXTRA_DIST += \
+ gnome-maps.in
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]