brl/gnome-shell
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

src: consistentify Makefile indentation/alignment

Browse Source
This commit is contained in:
Dan Winship 2010-10-05 10:15:22 -04:00
parent 3d2d396c09
commit 38a69f56b4
4 changed files with 109 additions and 108 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/Makefile-gdmuser.am
View File

@ -1,24 +1,24 @@
gdmuser_cflags = \ gdmuser_cflags = \
-I$(top_srcdir)/src \ -I$(top_srcdir)/src \
-DPREFIX=\""$(prefix)"\" \ -DPREFIX=\""$(prefix)"\" \
-DLIBDIR=\""$(libdir)"\" \ -DLIBDIR=\""$(libdir)"\" \
-DDATADIR=\""$(datadir)"\" \ -DDATADIR=\""$(datadir)"\" \
-DG_DISABLE_DEPRECATED \ -DG_DISABLE_DEPRECATED \
-DG_LOG_DOMAIN=\"GdmUser\" \ -DG_LOG_DOMAIN=\"GdmUser\" \
$(GDMUSER_CFLAGS) \ $(GDMUSER_CFLAGS) \
$(NULL) $(NULL)
# please, keep this sorted alphabetically # please, keep this sorted alphabetically
gdmuser_source_h = \ gdmuser_source_h = \
gdmuser/gdm-user.h \ gdmuser/gdm-user.h \
gdmuser/gdm-user-private.h \ gdmuser/gdm-user-private.h \
gdmuser/gdm-user-manager.h \ gdmuser/gdm-user-manager.h \
$(NULL) $(NULL)
# please, keep this sorted alphabetically # please, keep this sorted alphabetically
gdmuser_source_c = \ gdmuser_source_c = \
gdmuser/gdm-user.c \ gdmuser/gdm-user.c \
gdmuser/gdm-user-manager.c \ gdmuser/gdm-user-manager.c \
$(NULL) $(NULL)
noinst_LTLIBRARIES += libgdmuser-1.0.la noinst_LTLIBRARIES += libgdmuser-1.0.la

176
src/Makefile-st.am
View File

@ -1,19 +1,19 @@
st_cflags = \ st_cflags = \
-I$(top_srcdir)/src \ -I$(top_srcdir)/src \
-DPREFIX=\""$(prefix)"\" \ -DPREFIX=\""$(prefix)"\" \
-DLIBDIR=\""$(libdir)"\" \ -DLIBDIR=\""$(libdir)"\" \
-DG_DISABLE_DEPRECATED \ -DG_DISABLE_DEPRECATED \
-DG_LOG_DOMAIN=\"St\" \ -DG_LOG_DOMAIN=\"St\" \
-DST_COMPILATION \ -DST_COMPILATION \
-DPACKAGE_DATA_DIR=\"$(pkgdatadir)\" \ -DPACKAGE_DATA_DIR=\"$(pkgdatadir)\" \
$(ST_CFLAGS) \ $(ST_CFLAGS) \
$(NULL) $(NULL)
st_built_sources = \ st_built_sources = \
st-enum-types.h \ st-enum-types.h \
st-enum-types.c \ st-enum-types.c \
st-marshal.h \ st-marshal.h \
st-marshal.c st-marshal.c
BUILT_SOURCES += $(st_built_sources) BUILT_SOURCES += $(st_built_sources)
@ -66,37 +66,37 @@ st-enum-types.c: stamp-st-enum-types.h st/st-enum-types.c.in
# please, keep this sorted alphabetically # please, keep this sorted alphabetically
st_source_h = \ st_source_h = \
st/st-adjustment.h \ st/st-adjustment.h \
st/st-bin.h \ st/st-bin.h \
st/st-border-image.h \ st/st-border-image.h \
st/st-box-layout.h \ st/st-box-layout.h \
st/st-box-layout-child.h \ st/st-box-layout-child.h \
st/st-button.h \ st/st-button.h \
st/st-clickable.h \ st/st-clickable.h \
st/st-clipboard.h \ st/st-clipboard.h \
st/st-container.h \ st/st-container.h \
st/st-drawing-area.h \ st/st-drawing-area.h \
st/st-entry.h \ st/st-entry.h \
st/st-group.h \ st/st-group.h \
st/st-im-text.h \ st/st-im-text.h \
st/st-label.h \ st/st-label.h \
st/st-overflow-box.h \ st/st-overflow-box.h \
st/st-private.h \ st/st-private.h \
st/st-scrollable.h \ st/st-scrollable.h \
st/st-scroll-bar.h \ st/st-scroll-bar.h \
st/st-scroll-view.h \ st/st-scroll-view.h \
st/st-shadow.h \ st/st-shadow.h \
st/st-subtexture.h \ st/st-subtexture.h \
st/st-table.h \ st/st-table.h \
st/st-table-child.h \ st/st-table-child.h \
st/st-texture-cache.h \ st/st-texture-cache.h \
st/st-theme.h \ st/st-theme.h \
st/st-theme-context.h \ st/st-theme-context.h \
st/st-theme-node.h \ st/st-theme-node.h \
st/st-tooltip.h \ st/st-tooltip.h \
st/st-types.h \ st/st-types.h \
st/st-widget.h \ st/st-widget.h \
$(NULL) $(NULL)
st.h: Makefile st.h: Makefile
$(AM_V_GEN) (echo "#define ST_H_INSIDE 1"; \ $(AM_V_GEN) (echo "#define ST_H_INSIDE 1"; \
@ -107,58 +107,58 @@ st.h: Makefile
BUILT_SOURCES += st.h BUILT_SOURCES += st.h
st_source_private_h = \ st_source_private_h = \
st/st-private.h \ st/st-private.h \
st/st-table-private.h \ st/st-table-private.h \
st/st-theme-private.h \ st/st-theme-private.h \
st/st-theme-node-private.h \ st/st-theme-node-private.h \
st/st-theme-node-transition.h st/st-theme-node-transition.h
# please, keep this sorted alphabetically # please, keep this sorted alphabetically
st_source_c = \ st_source_c = \
st/st-adjustment.c \ st/st-adjustment.c \
st/st-bin.c \ st/st-bin.c \
st/st-border-image.c \ st/st-border-image.c \
st/st-box-layout.c \ st/st-box-layout.c \
st/st-box-layout-child.c \ st/st-box-layout-child.c \
st/st-button.c \ st/st-button.c \
st/st-clickable.c \ st/st-clickable.c \
st/st-clipboard.c \ st/st-clipboard.c \
st/st-container.c \ st/st-container.c \
st/st-drawing-area.c \ st/st-drawing-area.c \
st/st-entry.c \ st/st-entry.c \
st/st-group.c \ st/st-group.c \
st/st-im-text.c \ st/st-im-text.c \
st/st-label.c \ st/st-label.c \
st/st-overflow-box.c \ st/st-overflow-box.c \
st/st-private.c \ st/st-private.c \
st/st-scrollable.c \ st/st-scrollable.c \
st/st-scroll-bar.c \ st/st-scroll-bar.c \
st/st-scroll-view.c \ st/st-scroll-view.c \
st/st-shadow.c \ st/st-shadow.c \
st/st-subtexture.c \ st/st-subtexture.c \
st/st-table.c \ st/st-table.c \
st/st-table-child.c \ st/st-table-child.c \
st/st-texture-cache.c \ st/st-texture-cache.c \
st/st-theme.c \ st/st-theme.c \
st/st-theme-context.c \ st/st-theme-context.c \
st/st-theme-node.c \ st/st-theme-node.c \
st/st-theme-node-drawing.c \ st/st-theme-node-drawing.c \
st/st-theme-node-transition.c \ st/st-theme-node-transition.c \
st/st-tooltip.c \ st/st-tooltip.c \
st/st-widget.c \ st/st-widget.c \
$(NULL) $(NULL)
noinst_LTLIBRARIES += libst-1.0.la noinst_LTLIBRARIES += libst-1.0.la
libst_1_0_la_LIBADD = -lm $(ST_LIBS) libst_1_0_la_LIBADD = -lm $(ST_LIBS)
libst_1_0_la_SOURCES = \ libst_1_0_la_SOURCES = \
$(st_source_c) \ $(st_source_c) \
$(st_source_private_h) \ $(st_source_private_h) \
$(st_source_private_c) \ $(st_source_private_c) \
$(st_source_h) \ $(st_source_h) \
st.h \ st.h \
$(st_built_sources) \ $(st_built_sources) \
$(NULL) $(NULL)
libst_1_0_la_CPPFLAGS = $(st_cflags) libst_1_0_la_CPPFLAGS = $(st_cflags)
libst_1_0_la_LDFLAGS = $(LDADD) libst_1_0_la_LDFLAGS = $(LDADD)

4
src/Makefile-tray.am
View File

@ -6,7 +6,7 @@ tray_cflags = \
$(NULL) $(NULL)
tray_built_sources = \ tray_built_sources = \
na-marshal.h \ na-marshal.h \
na-marshal.c na-marshal.c
BUILT_SOURCES += $(tray_built_sources) BUILT_SOURCES += $(tray_built_sources)
@ -45,7 +45,7 @@ na-marshal.c: Makefile tray/na-marshal.list
noinst_LTLIBRARIES += libtray.la noinst_LTLIBRARIES += libtray.la
libtray_la_LIBADD = $(TRAY_LIBS) libtray_la_LIBADD = $(TRAY_LIBS)
libtray_la_SOURCES = \ libtray_la_SOURCES = \
$(tray_source) \ $(tray_source) \
$(tray_built_sources) \ $(tray_built_sources) \
$(NULL) $(NULL)

23
src/Makefile.am
View File

@ -40,7 +40,7 @@ include Makefile-tray.am
gnome_shell_cflags = \ gnome_shell_cflags = \
$(MUTTER_PLUGIN_CFLAGS) \ $(MUTTER_PLUGIN_CFLAGS) \
$(LIBGNOMEUI_CFLAGS) \ $(LIBGNOMEUI_CFLAGS) \
-I$(srcdir)/tray \ -I$(srcdir)/tray \
-DLOCALEDIR=\"$(datadir)/locale\" \ -DLOCALEDIR=\"$(datadir)/locale\" \
-DGNOME_SHELL_DATADIR=\"$(pkgdatadir)\" \ -DGNOME_SHELL_DATADIR=\"$(pkgdatadir)\" \
@ -78,7 +78,7 @@ shell_public_headers_h = \
shell-tray-manager.h \ shell-tray-manager.h \
shell-uri-util.h \ shell-uri-util.h \
shell-window-tracker.h \ shell-window-tracker.h \
shell-wm.h \ shell-wm.h \
shell-xfixes-cursor.h shell-xfixes-cursor.h
libgnome_shell_la_SOURCES = \ libgnome_shell_la_SOURCES = \
@ -89,7 +89,7 @@ libgnome_shell_la_SOURCES = \
shell-global-private.h \ shell-global-private.h \
shell-jsapi-compat-private.h \ shell-jsapi-compat-private.h \
shell-window-tracker-private.h \ shell-window-tracker-private.h \
shell-wm-private.h \ shell-wm-private.h \
gnome-shell-plugin.c \ gnome-shell-plugin.c \
gtk-compat.h \ gtk-compat.h \
shell-app.c \ shell-app.c \
@ -110,7 +110,7 @@ libgnome_shell_la_SOURCES = \
shell-tray-manager.c \ shell-tray-manager.c \
shell-uri-util.c \ shell-uri-util.c \
shell-window-tracker.c \ shell-window-tracker.c \
shell-wm.c \ shell-wm.c \
shell-xfixes-cursor.c shell-xfixes-cursor.c
libgnome_shell_la_gir_sources = \ libgnome_shell_la_gir_sources = \
@ -184,9 +184,10 @@ shell-enum-types.c: shell-enum-types.c.in stamp-shell-enum-types.h
EXTRA_DIST += shell-enum-types.c.in EXTRA_DIST += shell-enum-types.c.in
libgnome_shell_la_LDFLAGS = -avoid-version -module libgnome_shell_la_LDFLAGS = -avoid-version -module
libgnome_shell_la_LIBADD =-lm \ libgnome_shell_la_LIBADD = \
-lm \
$(MUTTER_PLUGIN_LIBS) \ $(MUTTER_PLUGIN_LIBS) \
$(LIBGNOMEUI_LIBS) \ $(LIBGNOMEUI_LIBS) \
libst-1.0.la \ libst-1.0.la \
libgdmuser-1.0.la \ libgdmuser-1.0.la \
libtray.la libtray.la
@ -205,9 +206,9 @@ Shell-0.1.gir: $(mutter) $(G_IR_SCANNER) St-1.0.gir libgnome-shell.la Makefile
--include=Clutter-1.0 \ --include=Clutter-1.0 \
--include=ClutterX11-1.0 \ --include=ClutterX11-1.0 \
--include=Meta-2.91 \ --include=Meta-2.91 \
--libtool="$(LIBTOOL)" \ --libtool="$(LIBTOOL)" \
--add-include-path=$(builddir) \ --add-include-path=$(builddir) \
--include=St-1.0 \ --include=St-1.0 \
--program=mutter \ --program=mutter \
--program-arg=--mutter-plugins=$$(pwd)/libgnome-shell.la \ --program-arg=--mutter-plugins=$$(pwd)/libgnome-shell.la \
$(addprefix $(srcdir)/,$(libgnome_shell_la_gir_sources)) \ $(addprefix $(srcdir)/,$(libgnome_shell_la_gir_sources)) \
@ -263,8 +264,8 @@ Gdm-1.0.gir: $(mutter) $(G_IR_SCANNER) libgdmuser-1.0.la Makefile
--libtool="$(LIBTOOL)" \ --libtool="$(LIBTOOL)" \
--library=libgdmuser-1.0.la \ --library=libgdmuser-1.0.la \
$(filter-out %-private.h, $(addprefix $(srcdir)/,$(gdmuser_source_h))) \ $(filter-out %-private.h, $(addprefix $(srcdir)/,$(gdmuser_source_h))) \
$(addprefix $(srcdir)/,$(gdmuser_source_c)) \ $(addprefix $(srcdir)/,$(gdmuser_source_c)) \
$(gdmuser_cflags) \ $(gdmuser_cflags) \
-o $@ -o $@
CLEANFILES += Gdm-1.0.gir CLEANFILES += Gdm-1.0.gir