[gnome-shell: 1/2] Make "make distcheck" work, and verify that we're
- From: Dan Winship <danw src gnome org>
- To: svn-commits-list gnome org
- Subject: [gnome-shell: 1/2] Make "make distcheck" work, and verify that we're
- Date: Thu, 12 Mar 2009 11:43:08 -0400 (EDT)
commit e01efd36358da845840a8a1d11422f622f8a7eee
Author: Dan Winship <danw gnome org>
Date: Tue Mar 10 12:53:03 2009 -0400
Make "make distcheck" work, and verify that we're disting all the javascript
---
Makefile.am | 17 ++++++++++++++++-
configure.ac | 2 ++
data/Makefile.am | 5 +++--
js/Makefile.am | 1 +
js/ui/Makefile.am | 16 ++++++++++++++++
src/Makefile-big.am | 3 ++-
src/Makefile.am | 17 +++++++++--------
7 files changed, 49 insertions(+), 12 deletions(-)
diff --git a/Makefile.am b/Makefile.am
index 685a80f..2d20ae6 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,3 +1,18 @@
-SUBDIRS = src data
+SUBDIRS = data js src
+EXTRA_DIST = \
+ .project \
+ .settings
+distcheck-hook:
+ @echo "Checking disted javascript against files in git"
+ @failed=false; \
+ for f in `cd $(srcdir) && git-ls-files js` ; do \
+ if ! test -e $(distdir)/$$f ; then \
+ echo File missing from distribution: $$f ; \
+ failed=true ; \
+ fi \
+ done ; \
+ if $$failed ; then \
+ exit 1 ; \
+ fi
diff --git a/configure.ac b/configure.ac
index 588dfc1..fd36fa1 100644
--- a/configure.ac
+++ b/configure.ac
@@ -73,6 +73,8 @@ AC_SUBST(metacity)
AC_OUTPUT([
Makefile
data/Makefile
+ js/Makefile
+ js/ui/Makefile
src/Makefile
src/gnome-shell
])
diff --git a/data/Makefile.am b/data/Makefile.am
index d94d46e..a208810 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -1,4 +1,5 @@
imagedir = $(pkgdatadir)/images
-image_DATA = \
- add-workspace.svg
+dist_image_DATA = \
+ add-workspace.svg \
+ remove-workspace.svg
diff --git a/js/Makefile.am b/js/Makefile.am
new file mode 100644
index 0000000..aac7812
--- /dev/null
+++ b/js/Makefile.am
@@ -0,0 +1 @@
+SUBDIRS = ui
diff --git a/js/ui/Makefile.am b/js/ui/Makefile.am
new file mode 100644
index 0000000..ded5d95
--- /dev/null
+++ b/js/ui/Makefile.am
@@ -0,0 +1,16 @@
+jsuidir = $(pkgdatadir)/js/ui
+
+dist_jsui_DATA = \
+ appDisplay.js \
+ button.js \
+ dnd.js \
+ docDisplay.js \
+ genericDisplay.js \
+ link.js \
+ main.js \
+ overlay.js \
+ panel.js \
+ runDialog.js \
+ tweener.js \
+ windowManager.js \
+ workspaces.js
diff --git a/src/Makefile-big.am b/src/Makefile-big.am
index 7b5ea6e..c0ede9d 100644
--- a/src/Makefile-big.am
+++ b/src/Makefile-big.am
@@ -62,6 +62,7 @@ libbig_1_0_la_LDFLAGS = $(LDADD)
CLEANFILES += $(BIG_STAMP_FILES) $(BUILT_SOURCES)
-EXTRA_DIST += \
+EXTRA_DIST += \
+ big/README \
big/big-enum-types.h.in \
big/big-enum-types.c.in
diff --git a/src/Makefile.am b/src/Makefile.am
index 8680243..d03c4fd 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -14,7 +14,7 @@ include Makefile-taskpanel.am
gnome_shell_cflags = \
$(MUTTER_PLUGIN_CFLAGS) \
$(LIBGNOMEUI_CFLAGS) \
- -Itray \
+ -I$(srcdir)/tray \
-DGETTEXT_PACKAGE=gnome-shell \
-DGNOME_SHELL_DATADIR=\"$(pkgdatadir)\" \
-DGNOME_SHELL_PKGLIBDIR=\"$(pkglibdir)\" \
@@ -28,6 +28,7 @@ shell_built_sources = \
shell-marshal.c
BUILT_SOURCES += $(shell_built_sources)
+EXTRA_DIST += shell-marshal.list
SHELL_STAMP_FILES = stamp-shell-marshal.h
CLEANFILES += $(SHELL_STAMP_FILES)
@@ -99,7 +100,7 @@ Shell-0.1.gir: $(metacity) $(G_IR_SCANNER) Big-1.0.gir libgnome-shell.la Makefil
--include=Big-1.0 \
--program=metacity \
--program-arg=--mutter-plugins=$$(pwd)/libgnome-shell.la \
- $(libgnome_shell_la_gir_sources) \
+ $(addprefix $(srcdir)/,$(libgnome_shell_la_gir_sources)) \
$(libgnome_shell_la_CPPFLAGS) \
-o $@
CLEANFILES += Shell-0.1.gir
@@ -117,9 +118,9 @@ Tidy-1.0.gir: $(metacity) $(G_IR_SCANNER) libgnome-shell.la libtidy-1.0.la Makef
--include=Clutter-0.9 \
--program=metacity \
--program-arg=--mutter-plugins=$$(pwd)/libgnome-shell.la \
- $(tidy_source_h) \
- $(tidy_source_c) \
- tidy-enum-types.h \
+ $(addprefix $(srcdir)/,$(tidy_source_h)) \
+ $(addprefix $(srcdir)/,$(tidy_source_c)) \
+ $(srcdir)/tidy-enum-types.h \
$(tidy_cflags) \
-o $@
CLEANFILES += Tidy-1.0.gir
@@ -136,9 +137,9 @@ Big-1.0.gir: $(metacity) $(G_IR_SCANNER) libgnome-shell.la libbig-1.0.la Makefil
--include=GdkPixbuf-2.0 \
--program=metacity \
--program-arg=--mutter-plugins=$$(pwd)/libgnome-shell.la \
- $(big_source_h) \
- $(big_source_c) \
- big-enum-types.h \
+ $(addprefix $(srcdir)/,$(big_source_h)) \
+ $(addprefix $(srcdir)/,$(big_source_c)) \
+ $(srcdir)/big-enum-types.h \
$(big_cflags) \
-o $@
CLEANFILES += Big-1.0.gir
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]