EMODULES: Fix & Unify autofoo stuff everywhere, fix dist tarballs support, add ability to create dist tarball of all modules.

SVN revision: 41571

.cvsignore

@@ -1,23 +0,0 @@
-ABOUT-NLS
-Makefile
-Makefile.in
-aclocal.m4
-autom4te.cache
-config.guess
-config.h
-config.h.in
-config.log
-config.rpath
-config.status
-config.sub
-configure
-depcomp
-e_modules-moon.spec
-install-sh
-libtool
-ltmain.sh
-m4
-missing
-mkinstalldirs
-stamp-h1
-*.tar.gz

Makefile.am

@@ -1,10 +1,27 @@
 ACLOCAL_AMFLAGS = -I m4
-SUBDIRS = src data po
+MAINTAINERCLEANFILES = Makefile.in aclocal.m4 config.guess config.h.in \
+		       config.sub configure depcomp install-sh ltmain.sh \
+		       missing module.desktop config.rpath mkinstalldirs
 
-MAINTAINERCLEANFILES = Makefile.in aclocal.m4 config.guess \
-                       config.h.in config.h.in~ config.sub \
-		       configure install-sh ltconfig ltmain.sh \
-		       missing mkinstalldirs stamp-h.in depcomp
+SUBDIRS = src po
 
-EXTRA_DIST = autogen.sh
+EDJE_FLAGS = -v \
+	     -id $(top_srcdir)/images
 
+filesdir = $(datadir)
+files_DATA = module.desktop moon.edj e-module-moon.edj
+
+EXTRA_DIST = module.desktop.in \
+	     e_modules-moon.spec.in \
+	     e-module-moon.edc \
+	     moon.edc \
+	     $(wildcard images/*.png)
+
+%.edj:  %.edc
+	$(EDJE_CC) $(EDJE_FLAGS) $< $@
+
+clean-local:
+	 rm -rf e-module-moon.edj moon.edj module.desktop e_modules-moon.spec *~
+
+uninstall:
+	 rm -rf $(DESTDIR)$(datadir)

configure.ac

@@ -1,6 +1,6 @@
-#                                               -*- Autoconf -*-
-# Process this file with autoconf to produce a configure script.
+dnl Process this file with autoconf to produce a configure script.
 
+# get rid of that stupid cache mechanism
 rm -f config.cache
 
 AC_INIT(moon, 0.2.2, enlightenment-devel@lists.sourceforge.net)
@@ -60,11 +60,11 @@ AC_ARG_ENABLE(homedir-install,
   [ datadir="${HOME}/.e/e/modules/${PACKAGE}" ]
 )
 
-AC_CONFIG_FILES([Makefile
-                 e_modules-moon.spec
-                 data/Makefile
-                 data/themes/Makefile
-                 data/themes/images/Makefile
-                 po/Makefile.in
-                 src/Makefile])
-AC_OUTPUT
+AC_OUTPUT([
+Makefile
+e_modules-moon.spec
+po/Makefile.in
+src/Makefile
+module.desktop
+], [
+])

data/.cvsignore

@@ -1,2 +0,0 @@
-Makefile
-Makefile.in

data/Makefile.am

@@ -1,2 +0,0 @@
-MAINTAINERCLEANFILES = Makefile.in
-SUBDIRS = themes

data/themes/.cvsignore

@@ -1,3 +0,0 @@
-Makefile
-Makefile.in
-*.edj

data/themes/Makefile.am

@@ -1,32 +0,0 @@
-MAINTAINERCLEANFILES = Makefile.in
-SUBDIRS = images 
-
-EDJE_FLAGS = \
--v \
--id $(top_srcdir)/data/themes/images
-
-
-# data files for the module
-filesdir = $(datadir)
-files_DATA = \
-module.desktop \
-e-module-moon.edj \
-moon.edj
-
-EXTRA_DIST = \
-module.desktop \
-moon.edc \
-icon.edc
-
-moon.edj: Makefile $(EXTRA_DIST)
-	 $(EDJE_CC) $(EDJE_FLAGS) \
-	 $(top_srcdir)/data/themes/moon.edc \
-	 moon.edj
-
-e-module-moon.edj: Makefile $(EXTRA_DIST)
-	 $(EDJE_CC) $(EDJE_FLAGS) \
-	 $(top_srcdir)/data/themes/icon.edc \
-	 e-module-moon.edj
-
-clean-local:
-	 rm -rf *.edj

data/themes/images/.cvsignore

@@ -1,2 +0,0 @@
-Makefile
-Makefile.in

data/themes/images/Makefile.am

@@ -1,65 +0,0 @@
-MAINTAINERCLEANFILES = Makefile.in
-
-EXTRA_DIST = \
-moon.png \
-e17_about_sky3.png \
-E-MoonClock-00.png \
-E-MoonClock-01.png \
-E-MoonClock-02.png \
-E-MoonClock-03.png \
-E-MoonClock-04.png \
-E-MoonClock-05.png \
-E-MoonClock-06.png \
-E-MoonClock-07.png \
-E-MoonClock-08.png \
-E-MoonClock-09.png \
-E-MoonClock-10.png \
-E-MoonClock-11.png \
-E-MoonClock-12.png \
-E-MoonClock-13.png \
-E-MoonClock-14.png \
-E-MoonClock-15.png \
-E-MoonClock-16.png \
-E-MoonClock-17.png \
-E-MoonClock-18.png \
-E-MoonClock-19.png \
-E-MoonClock-20.png \
-E-MoonClock-21.png \
-E-MoonClock-22.png \
-E-MoonClock-23.png \
-E-MoonClock-24.png \
-E-MoonClock-25.png \
-E-MoonClock-26.png \
-E-MoonClock-27.png \
-E-MoonClock-28.png \
-E-MoonClock-29.png \
-E-MoonClock-30.png \
-E-MoonClock-31.png \
-E-MoonClock-32.png \
-E-MoonClock-33.png \
-E-MoonClock-34.png \
-E-MoonClock-35.png \
-E-MoonClock-36.png \
-E-MoonClock-37.png \
-E-MoonClock-38.png \
-E-MoonClock-39.png \
-E-MoonClock-40.png \
-E-MoonClock-41.png \
-E-MoonClock-42.png \
-E-MoonClock-43.png \
-E-MoonClock-44.png \
-E-MoonClock-45.png \
-E-MoonClock-46.png \
-E-MoonClock-47.png \
-E-MoonClock-48.png \
-E-MoonClock-49.png \
-E-MoonClock-50.png \
-E-MoonClock-51.png \
-E-MoonClock-52.png \
-E-MoonClock-53.png \
-E-MoonClock-54.png \
-E-MoonClock-55.png \
-E-MoonClock-56.png \
-E-MoonClock-57.png \
-E-MoonClock-58.png \
-E-MoonClock-59.png 

e-module-moon.edc

@@ -1,5 +1,5 @@
 images {
-   image: "moon.png" COMP;
+   image: "module_icon.png" COMP;
 }
 collections {
    group {
@@ -12,7 +12,7 @@ collections {
 	       state: "default" 0.0;
 	       aspect: 1.0 1.0;
 	       aspect_preference: BOTH;
-	       image.normal: "moon.png";
+	       image.normal: "module_icon.png";
 	    }
 	 }
       }

po/.cvsignore

@@ -1,17 +0,0 @@
-Makefile
-Makefile.in
-Makefile.in.in
-Makevars.template
-Rules-quot
-boldquot.sed
-en@boldquot.header
-en@quot.header
-insert-header.sin
-quot.sed
-remove-potcdate.sin
-remove-potcdate.sed
-POTFILES
-stamp-po
-*.gmo
-*.mo
-*.pot

src/.cvsignore

@@ -1,6 +0,0 @@
-.deps
-.libs
-Makefile
-Makefile.in
-*.lo
-*.la

src/Makefile.am

@@ -1,21 +1,22 @@
 MAINTAINERCLEANFILES = Makefile.in
 
-# the module .so file
-AM_CPPFLAGS            = -I. \
-			 -I$(top_srcdir) \
-			 -I$(includedir) \
-			 @E_CFLAGS@
+INCLUDES = -I. \
+	   -I$(top_srcdir) \
+	   -I$(includedir) \
+	   @E_CFLAGS@
 
-pkgdir                 = $(datadir)/$(MODULE_ARCH)
+pkgdir = $(datadir)/$(MODULE_ARCH)
+pkg_LTLIBRARIES = module.la
+module_la_SOURCES = e_mod_main.c \
+		    e_mod_main.h \
+		    e_mod_config.c \
+		    CalcEphem.c \
+		    CalcEphem.h \
+		    Moon.c
 
-pkg_LTLIBRARIES        = module.la
-module_la_SOURCES      = e_mod_main.c \
-		         e_mod_main.h \
-			 e_mod_config.c \
-			 CalcEphem.c \
-			 CalcEphem.h \
-			 Moon.c
-module_la_LIBADD       = @E_LIBS@
-module_la_LDFLAGS      = -module -avoid-version
+module_la_LIBADD = @E_LIBS@
+module_la_LDFLAGS = -module -avoid-version
 module_la_DEPENDENCIES = $(top_builddir)/config.h
 
+clean-local:
+	rm -rf *~