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

SVN revision: 41571
15 years ago · ca4ae42b5f
parent 35351d1f7b
commit ca4ae42b5f
9 changed files with 64 additions and 145 deletions
--- a/.cvsignore
+++ b/.cvsignore
@ -1,29 +0,0 @@
-.deps
-.libs
-Makefile
-Makefile.in
-aclocal.m4
-autom4te.cache
-config.guess
-config.h
-config.h.in
-config.log
-config.rpath
-config.status
-config.sub
-configure
-depcomp
-install-sh
-libtool
-m4
-missing
-mkinstalldirs
-ltmain.sh
-stamp-h1
-*.lo
-*.la
-*.edj
-*.spec
-*.tar.gz
-module.desktop
-INSTALL
--- a/Makefile.am
+++ b/Makefile.am
@ -1,32 +1,28 @@
+ACLOCAL_AMFLAGS = -I m4
 MAINTAINERCLEANFILES = Makefile.in aclocal.m4 config.guess config.h.in \
 		       config.sub configure depcomp install-sh ltmain.sh \
-		       missing module.desktop
+		       missing module.desktop config.rpath mkinstalldirs

 SUBDIRS = src

 EDJE_FLAGS = -v \
-	   -id $(top_srcdir)/images
-
-# data files for the module
-filesdir =  $(datadir)
+	     -id $(top_srcdir)/images

-files_DATA = module.desktop \
-	     e-module-diskio.edj
+filesdir = $(datadir)
+files_DATA = module.desktop e-module-diskio.edj

-EXTRA_DIST = $(files_DATA) \
-	     module.desktop.in \
+EXTRA_DIST = module.desktop.in \
+	     e_modules-diskio.spec.in \
 	     e-module-diskio.edc \
 	     images/module_icon.png \
 	     images/module_icon_r.png \
 	     images/module_icon_w.png

-ACLOCAL_AMFLAGS = -I m4
-
 %.edj:  %.edc
 	$(EDJE_CC) $(EDJE_FLAGS) $< $@

 clean-local:
-	 rm -rf e-module-diskio.edj module.desktop *~
+	 rm -rf e-module-diskio.edj module.desktop e_modules-diskio.spec *~
+
 uninstall:
 	 rm -rf $(DESTDIR)$(datadir)
-
--- a/ac_attribute.m4
+++ b/ac_attribute.m4
@ -1,14 +0,0 @@
-
-AC_DEFUN([AC_C___ATTRIBUTE__],
-[
-  AC_MSG_CHECKING(for __attribute__)
-  AC_CACHE_VAL(ac_cv___attribute__, [
-  AC_TRY_COMPILE([#include <stdlib.h>],
-  [int func(int x); int foo(int x __attribute__ ((unused))) { exit(1); }],
-  ac_cv___attribute__=yes, ac_cv___attribute__=no)])
-  if test "$ac_cv___attribute__" = "yes"; then
-    AC_DEFINE(HAVE___ATTRIBUTE__, 1, [Define to 1 if your compiler has __attribute__])
-  fi
-  AC_MSG_RESULT($ac_cv___attribute__)
-])
-
--- a/configure.ac
+++ b/configure.ac
@ -5,7 +5,7 @@ rm -f config.cache

 AC_INIT(diskio, 0.0.1, morlenxus@gmx.net)
 AC_PREREQ(2.52)
-AC_CONFIG_SRCDIR(configure.in)
+AC_CONFIG_SRCDIR(configure.ac)
 AC_CANONICAL_BUILD
 AC_CANONICAL_HOST
 AC_ISC_POSIX
@ -49,7 +49,6 @@ AC_MSG_RESULT(${EDJE_CC})
 PKG_CHECK_MODULES(E, [enlightenment])

 datadir=$(pkg-config --variable=modules enlightenment)/${PACKAGE}
-
 AC_ARG_ENABLE(homedir-install,
  AS_HELP_STRING([--enable-homedir-install], [Install module in homedir]),
  [ datadir="${HOME}/.e/e/modules/${PACKAGE}" ]
@ -58,6 +57,7 @@ AC_ARG_ENABLE(homedir-install,
 AC_OUTPUT([
 Makefile
 src/Makefile
+e_modules-diskio.spec
 module.desktop
 ], [
 ])
--- a/e_modules-diskio.spec.in
+++ b/e_modules-diskio.spec.in
@ -0,0 +1,50 @@
+%define module_name diskio
+
+Summary: %{module_name} module for the Enlightenment window manager
+Name: e_modules-%{module_name}
+Version: @VERSION@
+Release: 0.%(date '+%Y%m%d')
+License: BSD
+Group: User Interface/Desktops
+URL: http://www.enlightenment.org/
+Source: ftp://ftp.enlightenment.org/pub/enlightenment/%{module_name}-%{version}.tar.gz
+Packager: %{?_packager:%{_packager}}%{!?_packager:quaker <quaker@gmail.com>}
+Vendor: %{?_vendorinfo:%{_vendorinfo}}%{!?_vendorinfo:The Enlightenment Project (http://www.enlightenment.org/)}
+Distribution: %{?_distribution:%{_distribution}}%{!?_distribution:%{_vendor}}
+BuildRequires: edje-bin
+BuildRequires: enlightenment-devel >= 0.16.999
+Requires: enlightenment >= 0.16.999
+BuildRoot: %{_tmppath}/%{name}-%{version}-root
+
+%description
+%{module_name} module for the Enlightenment window manager.
+
+%prep
+%setup -q -n %{module_name}-%{version}
+
+%build
+%{configure}
+%{__make} %{?_smp_mflags} %{?mflags}
+
+%install
+%{__make} %{?mflags_install} DESTDIR=$RPM_BUILD_ROOT install
+%{find_lang} %{module_name} || true > %{module_name}.lang
+
+%clean
+test "x$RPM_BUILD_ROOT" != "x/" && rm -rf $RPM_BUILD_ROOT
+
+%post
+/sbin/ldconfig
+
+%postun
+/sbin/ldconfig
+
+%files -f %{module_name}.lang
+%defattr(-, root, root)
+%doc AUTHORS ChangeLog COPYING* INSTALL NEWS README
+%if "%{module_name}" == "emu"
+%{_bindir}/%{module_name}*
+%endif
+%{_libdir}/enlightenment/modules/%{module_name}*
+
+%changelog
--- a/images/.cvsignore
+++ b/images/.cvsignore
@ -1,28 +0,0 @@
-.deps
-.libs
-Makefile
-Makefile.in
-aclocal.m4
-autom4te.cache
-config.guess
-config.h
-config.h.in
-config.log
-config.rpath
-config.status
-config.sub
-configure
-depcomp
-install-sh
-libtool
-m4
-missing
-mkinstalldirs
-ltmain.sh
-stamp-h1
-*.lo
-*.la
-*.edj
-*.spec
-*.tar.gz
-module.desktop
--- a/m4/.cvsignore
+++ b/m4/.cvsignore
@ -1,28 +0,0 @@
-.deps
-.libs
-Makefile
-Makefile.in
-aclocal.m4
-autom4te.cache
-config.guess
-config.h
-config.h.in
-config.log
-config.rpath
-config.status
-config.sub
-configure
-depcomp
-install-sh
-libtool
-m4
-missing
-mkinstalldirs
-ltmain.sh
-stamp-h1
-*.lo
-*.la
-*.edj
-*.spec
-*.tar.gz
-module.desktop
--- a/src/.cvsignore
+++ b/src/.cvsignore
@ -1,28 +0,0 @@
-.deps
-.libs
-Makefile
-Makefile.in
-aclocal.m4
-autom4te.cache
-config.guess
-config.h
-config.h.in
-config.log
-config.rpath
-config.status
-config.sub
-configure
-depcomp
-install-sh
-libtool
-m4
-missing
-mkinstalldirs
-ltmain.sh
-stamp-h1
-*.lo
-*.la
-*.edj
-*.spec
-*.tar.gz
-module.desktop
--- a/src/Makefile.am
+++ b/src/Makefile.am
@ -1,9 +1,9 @@
 MAINTAINERCLEANFILES = Makefile.in

 INCLUDES = -I. \
-	 -I$(top_srcdir) \
-	 -I$(includedir) \
-	 @E_CFLAGS@
+	   -I$(top_srcdir) \
+	   -I$(includedir) \
+	   @E_CFLAGS@

 pkgdir = $(datadir)/$(MODULE_ARCH)
 pkg_LTLIBRARIES = module.la