fixed dist stuff

SVN revision: 10179

diff --git a/legacy/edje/Makefile.am b/legacy/edje/Makefile.am
index 2d5a45e..123ee4b 100644 (file)
--- a/legacy/edje/Makefile.am
+++ b/legacy/edje/Makefile.am
@@ -1,21 +1,12 @@
 ## Process this file with automake to produce Makefile.in
 
-SUBDIRS = src
+SUBDIRS = data src
 
 MAINTAINERCLEANFILES = Makefile.in aclocal.m4 config.guess \
                        config.h.in config.sub configure install-sh \
                       ltconfig ltmain.sh missing mkinstalldirs \
                       stamp-h.in edje_docs.tar edje_docs.tar.gz edje.c
 
-install-data-local:
-       @$(NORMAL_INSTALL)
-       if test -d $(srcdir)/data; then \
-        $(mkinstalldirs) $(DESTDIR)$(pkgdatadir)/data; \
-         for d in $(srcdir)/data/*; do \
-             cp -pR $$d $(DESTDIR)$(pkgdatadir)/data; \
-         done \
-       fi
-
 ### this is all fine and great - ut edje should not be going and installing
 ### data in another software's data dir - it's just wrong. not to mention this
 ### also breaks make distcheck...
@@ -28,13 +19,7 @@ dist-hook:
        ./gendoc; \
        tar cvf edje_docs.tar doc/html doc/latex doc/man; \
        rm -f edje_docs.tar.gz; \
-       gzip -9 edje_docs.tar; \
-       if test -d data; then \
-         mkdir $(distdir)/data; \
-         for file in data/*; do \
-           cp -pR $$file $(distdir)/data; \
-         done \
-       fi
+       gzip -9 edje_docs.tar;
 
 bin_SCRIPTS = edje-config
 

diff --git a/legacy/edje/configure.in b/legacy/edje/configure.in
index f42d5a2..5f4d6ff 100644 (file)
--- a/legacy/edje/configure.in
+++ b/legacy/edje/configure.in
@@ -266,6 +266,21 @@ AC_SUBST(vimdir)
 
 AC_OUTPUT([
 Makefile
+data/Makefile
+data/images/Makefile
+data/include/Makefile
+data/src/Makefile
+data/template/Makefile
+data/template/embryo/Makefile
+data/template/fonts/Makefile
+data/template/hashes/Makefile
+data/template/images/Makefile
+data/template/macros/Makefile
+data/template/parts/Makefile
+data/template/programs/Makefile
+data/test/Makefile
+data/test/fonts/Makefile
+data/test/images/Makefile
 src/Makefile
 src/lib/Makefile
 src/bin/Makefile

diff --git a/legacy/edje/data/.cvsignore b/legacy/edje/data/.cvsignore
index 977ea94..c296cbf 100644 (file)
--- a/legacy/edje/data/.cvsignore
+++ b/legacy/edje/data/.cvsignore
@@ -1 +1,3 @@
+Makefile
+Makefile.in
 e_logo.eet

diff --git a/legacy/edje/data/Makefile.am b/legacy/edje/data/Makefile.am
new file mode 100644 (file)
index 0000000..264ec46
--- /dev/null
+++ b/legacy/edje/data/Makefile.am
@@ -0,0 +1,7 @@
+SUBDIRS = images include src template test
+FILES = e_logo.sh
+
+exampledir = $(pkgdatadir)/data
+example_DATA = $(FILES)
+
+EXTRA_DIST = $(FILES) edc.vim

diff --git a/legacy/edje/data/images/.cvsignore b/legacy/edje/data/images/.cvsignore
new file mode 100644 (file)
index 0000000..282522d
--- /dev/null
+++ b/legacy/edje/data/images/.cvsignore
@@ -0,0 +1,2 @@
+Makefile
+Makefile.in

diff --git a/legacy/edje/data/images/Makefile.am b/legacy/edje/data/images/Makefile.am
new file mode 100644 (file)
index 0000000..3cf213f
--- /dev/null
+++ b/legacy/edje/data/images/Makefile.am
@@ -0,0 +1,27 @@
+IMAGES = bg.png e.png \
+                e001.png e002.png e003.png e004.png e005.png e006.png \
+         e007.png e008.png e009.png e010.png e011.png e012.png \
+         e013.png e014.png e015.png e016.png e017.png e018.png \
+         e019.png e020.png e021.png e022.png e023.png e024.png \
+         e025.png e026.png e027.png e028.png e029.png e030.png \
+         e031.png e032.png e033.png e034.png e035.png e036.png \
+         e037.png e038.png e039.png e040.png e041.png e042.png \
+         e043.png e044.png e045.png e046.png e047.png e048.png \
+         e049.png e050.png e051.png e052.png e053.png e054.png \
+         e055.png e056.png e057.png e058.png e059.png e060.png \
+         e061.png e062.png e063.png e064.png e065.png e066.png \
+         e067.png e068.png e069.png e070.png e071.png e072.png \
+         e073.png e074.png e075.png e076.png e077.png e078.png \
+         e079.png e080.png e081.png e082.png e083.png e084.png \
+         e085.png e086.png e087.png e088.png e089.png e090.png \
+         e091.png e092.png e093.png e094.png e095.png e096.png \
+         e097.png e098.png e099.png e100.png e101.png e102.png \
+         e103.png e104.png e105.png e106.png e107.png e108.png \
+         e109.png e110.png e111.png e112.png e113.png e114.png \
+         e115.png e116.png e117.png e118.png e119.png e120.png
+
+imgdir = $(pkgdatadir)/data/images
+img_DATA = $(IMAGES)
+
+EXTRA_DIST = $(IMAGES)
+

diff --git a/legacy/edje/data/include/.cvsignore b/legacy/edje/data/include/.cvsignore
new file mode 100644 (file)
index 0000000..282522d
--- /dev/null
+++ b/legacy/edje/data/include/.cvsignore
@@ -0,0 +1,2 @@
+Makefile
+Makefile.in

diff --git a/legacy/edje/data/include/Makefile.am b/legacy/edje/data/include/Makefile.am
new file mode 100644 (file)
index 0000000..066273e
--- /dev/null
+++ b/legacy/edje/data/include/Makefile.am
@@ -0,0 +1,7 @@
+FILES = edje.inc
+
+incdir = $(pkgdatadir)/data/include
+inc_DATA = $(FILES)
+
+EXTRA_DIST = $(FILES)
+

diff --git a/legacy/edje/data/src/.cvsignore b/legacy/edje/data/src/.cvsignore
new file mode 100644 (file)
index 0000000..282522d
--- /dev/null
+++ b/legacy/edje/data/src/.cvsignore
@@ -0,0 +1,2 @@
+Makefile
+Makefile.in

diff --git a/legacy/edje/data/src/Makefile.am b/legacy/edje/data/src/Makefile.am
new file mode 100644 (file)
index 0000000..37a36df
--- /dev/null
+++ b/legacy/edje/data/src/Makefile.am
@@ -0,0 +1,6 @@
+FILES = e_logo.edc test.edc
+
+sourcedir = $(pkgdatadir)/data/src
+source_DATA = $(FILES)
+
+EXTRA_DIST = $(FILES)

diff --git a/legacy/edje/data/template/.cvsignore b/legacy/edje/data/template/.cvsignore
new file mode 100644 (file)
index 0000000..282522d
--- /dev/null
+++ b/legacy/edje/data/template/.cvsignore
@@ -0,0 +1,2 @@
+Makefile
+Makefile.in

diff --git a/legacy/edje/data/template/Makefile.am b/legacy/edje/data/template/Makefile.am
new file mode 100644 (file)
index 0000000..4d93544
--- /dev/null
+++ b/legacy/edje/data/template/Makefile.am
@@ -0,0 +1,8 @@
+SUBDIRS = embryo fonts hashes images macros parts programs
+
+FILES = README build_theme.sh default.edc
+
+tmpldir = $(pkgdatadir)/data/template
+tmpl_DATA = $(FILES)
+
+EXTRA_DIST = $(FILES)

diff --git a/legacy/edje/data/template/embryo/.cvsignore b/legacy/edje/data/template/embryo/.cvsignore
new file mode 100644 (file)
index 0000000..282522d
--- /dev/null
+++ b/legacy/edje/data/template/embryo/.cvsignore
@@ -0,0 +1,2 @@
+Makefile
+Makefile.in

diff --git a/legacy/edje/data/template/embryo/Makefile.am b/legacy/edje/data/template/embryo/Makefile.am
new file mode 100644 (file)
index 0000000..a2560af
--- /dev/null
+++ b/legacy/edje/data/template/embryo/Makefile.am
@@ -0,0 +1,6 @@
+FILES = global.edc
+
+incdir = $(pkgdatadir)/data/template/embryo
+inc_DATA = $(FILES)
+
+EXTRA_DIST = $(FILES)

diff --git a/legacy/edje/data/template/fonts/.cvsignore b/legacy/edje/data/template/fonts/.cvsignore
new file mode 100644 (file)
index 0000000..282522d
--- /dev/null
+++ b/legacy/edje/data/template/fonts/.cvsignore
@@ -0,0 +1,2 @@
+Makefile
+Makefile.in

diff --git a/legacy/edje/data/template/fonts/Makefile.am b/legacy/edje/data/template/fonts/Makefile.am
new file mode 100644 (file)
index 0000000..b89699f
--- /dev/null
+++ b/legacy/edje/data/template/fonts/Makefile.am
@@ -0,0 +1,6 @@
+FILES = Vera.ttf fonts.edc
+
+fontdir = $(pkgdatadir)/data/template/fonts
+font_DATA = $(FILES)
+
+EXTRA_DIST = $(FILES)

diff --git a/legacy/edje/data/template/hashes/.cvsignore b/legacy/edje/data/template/hashes/.cvsignore
new file mode 100644 (file)
index 0000000..282522d
--- /dev/null
+++ b/legacy/edje/data/template/hashes/.cvsignore
@@ -0,0 +1,2 @@
+Makefile
+Makefile.in

diff --git a/legacy/edje/data/template/hashes/Makefile.am b/legacy/edje/data/template/hashes/Makefile.am
new file mode 100644 (file)
index 0000000..a54aeed
--- /dev/null
+++ b/legacy/edje/data/template/hashes/Makefile.am
@@ -0,0 +1,6 @@
+FILES = hashes.edc
+
+hashdir = $(pkgdatadir)/data/template/hashes
+hash_DATA = $(FILES)
+
+EXTRA_DIST = $(FILES)

diff --git a/legacy/edje/data/template/images/.cvsignore b/legacy/edje/data/template/images/.cvsignore
new file mode 100644 (file)
index 0000000..282522d
--- /dev/null
+++ b/legacy/edje/data/template/images/.cvsignore
@@ -0,0 +1,2 @@
+Makefile
+Makefile.in

diff --git a/legacy/edje/data/template/images/Makefile.am b/legacy/edje/data/template/images/Makefile.am
new file mode 100644 (file)
index 0000000..9d80f97
--- /dev/null
+++ b/legacy/edje/data/template/images/Makefile.am
@@ -0,0 +1,6 @@
+FILES = images.edc
+
+imgdir = $(pkgdatadir)/data/template/images
+img_DATA = $(FILES)
+
+EXTRA_DIST = $(FILES)

diff --git a/legacy/edje/data/template/macros/.cvsignore b/legacy/edje/data/template/macros/.cvsignore
new file mode 100644 (file)
index 0000000..282522d
--- /dev/null
+++ b/legacy/edje/data/template/macros/.cvsignore
@@ -0,0 +1,2 @@
+Makefile
+Makefile.in

diff --git a/legacy/edje/data/template/macros/Makefile.am b/legacy/edje/data/template/macros/Makefile.am
new file mode 100644 (file)
index 0000000..30e46e8
--- /dev/null
+++ b/legacy/edje/data/template/macros/Makefile.am
@@ -0,0 +1,6 @@
+FILES = mymacro.edc
+
+macrodir = $(pkgdatadir)/data/template/macros
+macro_DATA = $(FILES)
+
+EXTRA_DIST = $(FILES)

diff --git a/legacy/edje/data/template/parts/.cvsignore b/legacy/edje/data/template/parts/.cvsignore
new file mode 100644 (file)
index 0000000..282522d
--- /dev/null
+++ b/legacy/edje/data/template/parts/.cvsignore
@@ -0,0 +1,2 @@
+Makefile
+Makefile.in

diff --git a/legacy/edje/data/template/parts/Makefile.am b/legacy/edje/data/template/parts/Makefile.am
new file mode 100644 (file)
index 0000000..31656eb
--- /dev/null
+++ b/legacy/edje/data/template/parts/Makefile.am
@@ -0,0 +1,6 @@
+FILES = bg.edc
+
+partdir = $(pkgdatadir)/data/template/parts
+part_DATA = $(FILES)
+
+EXTRA_DIST = $(FILES)

diff --git a/legacy/edje/data/template/programs/.cvsignore b/legacy/edje/data/template/programs/.cvsignore
new file mode 100644 (file)
index 0000000..282522d
--- /dev/null
+++ b/legacy/edje/data/template/programs/.cvsignore
@@ -0,0 +1,2 @@
+Makefile
+Makefile.in

diff --git a/legacy/edje/data/template/programs/Makefile.am b/legacy/edje/data/template/programs/Makefile.am
new file mode 100644 (file)
index 0000000..8a21fa3
--- /dev/null
+++ b/legacy/edje/data/template/programs/Makefile.am
@@ -0,0 +1,6 @@
+FILES = bg.edc
+
+progdir = $(pkgdatadir)/data/template/programs
+prog_DATA = $(FILES)
+
+EXTRA_DIST = $(FILES)

diff --git a/legacy/edje/data/test/.cvsignore b/legacy/edje/data/test/.cvsignore
new file mode 100644 (file)
index 0000000..282522d
--- /dev/null
+++ b/legacy/edje/data/test/.cvsignore
@@ -0,0 +1,2 @@
+Makefile
+Makefile.in

diff --git a/legacy/edje/data/test/Makefile.am b/legacy/edje/data/test/Makefile.am
new file mode 100644 (file)
index 0000000..9e01dd3
--- /dev/null
+++ b/legacy/edje/data/test/Makefile.am
@@ -0,0 +1 @@
+SUBDIRS = fonts images

diff --git a/legacy/edje/data/test/fonts/.cvsignore b/legacy/edje/data/test/fonts/.cvsignore
new file mode 100644 (file)
index 0000000..282522d
--- /dev/null
+++ b/legacy/edje/data/test/fonts/.cvsignore
@@ -0,0 +1,2 @@
+Makefile
+Makefile.in

diff --git a/legacy/edje/data/test/fonts/Makefile.am b/legacy/edje/data/test/fonts/Makefile.am
new file mode 100644 (file)
index 0000000..303a86c
--- /dev/null
+++ b/legacy/edje/data/test/fonts/Makefile.am
@@ -0,0 +1,9 @@
+FILES = Vera.ttf VeraBI.ttf VeraBd.ttf VeraIt.ttf VeraMoBI.ttf \
+        VeraMoBd.ttf VeraMoIt.ttf VeraMono.ttf VeraSe.ttf VeraSeBd.ttf \
+        fonts.alias fonts.dir
+
+fontsdir = $(pkgdatadir)/data/test/fonts
+fonts_DATA = $(FILES)
+
+EXTRA_DIST = $(FILES)
+

diff --git a/legacy/edje/data/test/images/.cvsignore b/legacy/edje/data/test/images/.cvsignore
new file mode 100644 (file)
index 0000000..282522d
--- /dev/null
+++ b/legacy/edje/data/test/images/.cvsignore
@@ -0,0 +1,2 @@
+Makefile
+Makefile.in

diff --git a/legacy/edje/data/test/images/Makefile.am b/legacy/edje/data/test/images/Makefile.am
new file mode 100644 (file)
index 0000000..82a8ae3
--- /dev/null
+++ b/legacy/edje/data/test/images/Makefile.am
@@ -0,0 +1,7 @@
+FILES = bg.png border.png item_normal.png item_selected.png \
+        item_title.png shadow.png
+
+imgdir = $(pkgdatadir)/data/test/images
+img_DATA = $(FILES)
+
+EXTRA_DIST = $(FILES)