From ca4ae42b5f17ddb8a87462901adc28146a1903ea Mon Sep 17 00:00:00 2001 From: Daniel Kolesa Date: Mon, 3 Aug 2009 14:49:56 +0000 Subject: [PATCH] EMODULES: Fix & Unify autofoo stuff everywhere, fix dist tarballs support, add ability to create dist tarball of all modules. SVN revision: 41571 --- .cvsignore | 29 --------------------- Makefile.am | 22 +++++++--------- ac_attribute.m4 | 14 ---------- configure.in => configure.ac | 4 +-- e_modules-diskio.spec.in | 50 ++++++++++++++++++++++++++++++++++++ images/.cvsignore | 28 -------------------- m4/.cvsignore | 28 -------------------- src/.cvsignore | 28 -------------------- src/Makefile.am | 6 ++--- 9 files changed, 64 insertions(+), 145 deletions(-) delete mode 100644 .cvsignore delete mode 100644 ac_attribute.m4 rename configure.in => configure.ac (96%) create mode 100644 e_modules-diskio.spec.in delete mode 100644 images/.cvsignore delete mode 100644 m4/.cvsignore delete mode 100644 src/.cvsignore diff --git a/.cvsignore b/.cvsignore deleted file mode 100644 index c3c897b..0000000 --- a/.cvsignore +++ /dev/null @@ -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 diff --git a/Makefile.am b/Makefile.am index 0026b31..e8e7b9f 100644 --- 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 + -id $(top_srcdir)/images -# data files for the module -filesdir = $(datadir) +filesdir = $(datadir) +files_DATA = module.desktop e-module-diskio.edj -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) - diff --git a/ac_attribute.m4 b/ac_attribute.m4 deleted file mode 100644 index 46c1a42..0000000 --- a/ac_attribute.m4 +++ /dev/null @@ -1,14 +0,0 @@ - -AC_DEFUN([AC_C___ATTRIBUTE__], -[ - AC_MSG_CHECKING(for __attribute__) - AC_CACHE_VAL(ac_cv___attribute__, [ - AC_TRY_COMPILE([#include ], - [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__) -]) - diff --git a/configure.in b/configure.ac similarity index 96% rename from configure.in rename to configure.ac index ac80ddc..e469cfd 100644 --- a/configure.in +++ 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 ], [ ]) diff --git a/e_modules-diskio.spec.in b/e_modules-diskio.spec.in new file mode 100644 index 0000000..86bfc49 --- /dev/null +++ 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 } +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 diff --git a/images/.cvsignore b/images/.cvsignore deleted file mode 100644 index 8a7e479..0000000 --- a/images/.cvsignore +++ /dev/null @@ -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 diff --git a/m4/.cvsignore b/m4/.cvsignore deleted file mode 100644 index 8a7e479..0000000 --- a/m4/.cvsignore +++ /dev/null @@ -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 diff --git a/src/.cvsignore b/src/.cvsignore deleted file mode 100644 index 8a7e479..0000000 --- a/src/.cvsignore +++ /dev/null @@ -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 diff --git a/src/Makefile.am b/src/Makefile.am index d47908b..c34cf3e 100644 --- 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