Make "make distcheck" work, and verify that we're disting all the javascript

This commit is contained in:
Dan Winship 2009-03-10 12:53:03 -04:00
parent 30a9c6b2f4
commit e01efd3635
7 changed files with 49 additions and 12 deletions

View File

@ -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

View File

@ -73,6 +73,8 @@ AC_SUBST(metacity)
AC_OUTPUT([
Makefile
data/Makefile
js/Makefile
js/ui/Makefile
src/Makefile
src/gnome-shell
])

View File

@ -1,4 +1,5 @@
imagedir = $(pkgdatadir)/images
image_DATA = \
add-workspace.svg
dist_image_DATA = \
add-workspace.svg \
remove-workspace.svg

1
js/Makefile.am Normal file
View File

@ -0,0 +1 @@
SUBDIRS = ui

16
js/ui/Makefile.am Normal file
View File

@ -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

View File

@ -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

View File

@ -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