Enlightenment CVS committal
Author : raster
Project : e_modules
Module : bling
Dir : e_modules/bling
Modified Files:
Makefile.am autogen.sh config.h.in configure.in
Log Message:
install to e's prefix by default, not ~/.e - cross-compile build cleanly too.
===================================================================
RCS file: /cvs/e/e_modules/bling/Makefile.am,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -3 -r1.9 -r1.10
--- Makefile.am 7 Nov 2007 20:34:04 -0000 1.9
+++ Makefile.am 25 Jan 2008 00:04:05 -0000 1.10
@@ -1,30 +1,44 @@
-MAINTAINERCLEANFILES = Makefile.in
+ACLOCAL_AMFLAGS = -I m4
+MAINTAINERCLEANFILES = Makefile.in aclocal.m4 config.guess config.h.in \
+ config.sub configure depcomp install-sh ltmain.sh \
+ missing config.rpath mkinstalldirs
+
+INCLUDES = -I. \
+ -I$(top_srcdir) \
+ -I$(includedir) \
+ @e_cflags@ @x_cflags@
+
+pkgdir = $(datadir)/$(MODULE_ARCH)
+pkg_LTLIBRARIES = module.la
+module_la_SOURCES = compmgr.c \
+ compmgr.h \
+ e_mod_main.c \
+ e_mod_main.h \
+ e_mod_config.c \
+ e_mod_config.h
+
+module_la_LIBADD = @e_libs@ @x_libs@
+module_la_LDFLAGS = -module -avoid-version
+module_la_DEPENDENCIES = $(top_builddir)/config.h
+
+EDJE_CC = @edje_cc@
+EDJE_FLAGS = -v \
+-id $(top_srcdir)/images \
+-fd $(top_srcdir)/fonts
-# data files for the module
filesdir = $(datadir)
-files_DATA = \
-module.desktop \
-e-module-bling.edj
+files_DATA = module.desktop \
+ e-module-bling.edj
EXTRA_DIST = $(files_DATA) \
-e_modules-bling.spec \
-compmgr.h
-
-# the module .so file
-INCLUDES = -I. \
- -I$(top_srcdir) \
- -I$(includedir) \
- @e_cflags@ @x_cflags@
-pkgdir = $(datadir)/$(MODULE_ARCH)
-pkg_LTLIBRARIES = module.la
-module_la_SOURCES = compmgr.c \
- e_mod_main.c \
- e_mod_main.h \
- e_mod_config.c \
- e_mod_config.h
-module_la_LIBADD = @e_libs@ @x_libs@
-module_la_LDFLAGS = -module -avoid-version
-module_la_DEPENDENCIES = $(top_builddir)/config.h
+ e_modules-bling.spec
+%.edj: %.edc
+ $(EDJE_CC) $(EDJE_FLAGS) $< $@
+
clean-local:
- rm -rf *~
+ rm -rf *~
+
+uninstall-hook:
+ rm -rf $(datadir)
+
===================================================================
RCS file: /cvs/e/e_modules/bling/autogen.sh,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -3 -r1.1.1.1 -r1.2
--- autogen.sh 5 Jun 2006 04:42:18 -0000 1.1.1.1
+++ autogen.sh 25 Jan 2008 00:04:05 -0000 1.2
@@ -5,11 +5,23 @@
touch README
-echo "Running aclocal..." ; aclocal $ACLOCAL_FLAGS || exit 1
+echo "Running autopoint..." ; autopoint -f || :
+echo "Running aclocal..." ; aclocal $ACLOCAL_FLAGS -I m4 || exit 1
echo "Running autoheader..." ; autoheader || exit 1
echo "Running autoconf..." ; autoconf || exit 1
echo "Running libtoolize..." ; (libtoolize --copy --automake || glibtoolize
--automake) || exit 1
echo "Running automake..." ; automake --add-missing --copy --gnu || exit 1
+echo "Generating gettext net.pot template"; \
+xgettext \
+--output net.pot \
+--output-dir=po \
+--language=C \
+--add-location \
+--keyword=D_ \
+--sort-by-file \
+--copyright-holder="TODO" \
+--foreign-user \
+`find . -name "*.[ch]" -print` || exit 1
if [ -z "$NOCONFIGURE" ]; then
./configure "$@"
===================================================================
RCS file: /cvs/e/e_modules/bling/config.h.in,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- config.h.in 12 Nov 2007 05:09:50 -0000 1.2
+++ config.h.in 25 Jan 2008 00:04:05 -0000 1.3
@@ -30,6 +30,9 @@
/* Define to 1 if you have the <unistd.h> header file. */
#undef HAVE_UNISTD_H
+/* "Module Locale Directory" */
+#undef LOCALEDIR
+
/* "Module architecture" */
#undef MODULE_ARCH
@@ -57,5 +60,5 @@
/* Version number of package */
#undef VERSION
-/* Define to empty if `const' does not conform to ANSI C. */
-#undef const
+/* Define to 1 if the X Window System is missing or not being used. */
+#undef X_DISPLAY_MISSING
===================================================================
RCS file: /cvs/e/e_modules/bling/configure.in,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -3 -r1.13 -r1.14
--- configure.in 20 Nov 2007 06:23:45 -0000 1.13
+++ configure.in 25 Jan 2008 00:04:05 -0000 1.14
@@ -1,50 +1,99 @@
-dnl Process this file with autoconf to produce a configure script.
-
-# get rid of that stupid cache mechanism
rm -f config.cache
-AC_INIT(bling, 0.0.1, [EMAIL PROTECTED])
-AC_PREREQ(2.52)
-AC_CONFIG_SRCDIR(configure.in)
+AC_PREREQ(2.59)
+AC_INIT([bling], [0.0.1], [EMAIL PROTECTED])
+AC_CONFIG_HEADERS(config.h)
+AC_CONFIG_MACRO_DIR([m4])
+AM_INIT_AUTOMAKE([1.8 foreign])
+
AC_CANONICAL_BUILD
AC_CANONICAL_HOST
-AC_ISC_POSIX
-
-AM_INIT_AUTOMAKE(1.6)
-AM_CONFIG_HEADER(config.h)
AC_PROG_CC
-AM_PROG_CC_STDC
+AM_PROG_LIBTOOL
AC_HEADER_STDC
-AC_C_CONST
-define([AC_LIBTOOL_LANG_CXX_CONFIG], [:])dnl
-define([AC_LIBTOOL_LANG_F77_CONFIG], [:])dnl
-AC_PROG_LIBTOOL
+#AM_GNU_GETTEXT([external])
+AM_GNU_GETTEXT_VERSION(0.14)
MODULE_ARCH="$host_os-$host_cpu"
AC_SUBST(MODULE_ARCH)
AC_DEFINE_UNQUOTED(MODULE_ARCH, "$MODULE_ARCH", "Module architecture")
-x_cflags="-I/usr/X11R6/include"
-x_libs="-L/usr/X11R6/lib -lX11 -lXext -lXrender -lXcomposite"
-AC_SUBST(x_cflags)
-AC_SUBST(x_libs)
-
-AC_PATH_PROG(EDJE_CC, "edje_cc", "", $PATH)
-
-AC_PATH_PROG(E_CONFIG, "enlightenment-config", "", $PATH)
+datadir="${libdir}/enlightenment/modules/${PACKAGE}"
+localedir=${datadir}/locale
+AC_SUBST(LOCALEDIR, "${localedir}")
+AC_DEFINE_UNQUOTED(LOCALEDIR, "${localedir}", "Module Locale Directory")
+
+#
+# Check EFL Libs
+#
+PKG_CHECK_MODULES(EDJE, [edje >= 0.5.0])
+AC_ARG_WITH(edje-cc,
+[ --with-edje-cc=PATH specify a specific path to edje_cc],
+[
+ v=$withval;
+ edje_cc=$v
+ echo " Enlightenment edje_cc explicitly set to "$edje_cc;
+],[
+ edje_cc=$(pkg-config --variable=prefix edje)/bin/edje_cc
+])
+AC_SUBST(edje_cc)
+
+#
+# Check Enlightenment
+#
+AC_ARG_WITH(enlightenment-config,
+[ --with-enlightenment-config=E_CONFIG use enlightenment-config specified
],
+[
+ E_CONFIG=$withval;
+ echo "using "$E_CONFIG" for enlightenment-config";
+],[
+ PROG="enlightenment-config";
+ AC_PATH_PROG(E_CONFIG, $PROG, "", $PATH)
+])
+
e_cflags=`$E_CONFIG --cflags`
e_libs=`$E_CONFIG --libs`
e_modules=`$E_CONFIG --module-dir`
AC_SUBST(e_cflags)
AC_SUBST(e_libs)
+AC_SUBST(e_modules)
-datadir="${e_modules}/${PACKAGE}"
-AC_ARG_ENABLE(homedir-install,
- AS_HELP_STRING([--enable-homedir-install], [Install module in homedir]),
- [ datadir="${HOME}/.e/e/modules/${PACKAGE}" ]
+#######################################
+## Simple X11 build/link
+
+AC_ARG_ENABLE(simple-x11,
+ AC_HELP_STRING([--enable-simple-x11], [enable simple x11 linking]),
+ [ want_evas_simple_x11=$enableval ]
+)
+
+x_dir=""
+x_cflags=""
+x_libs=""
+AC_PATH_XTRA
+AC_CHECK_HEADER(X11/X.h,
+ [
+ if test "x$want_evas_simple_x11" = "xyes"; then
+ x_libs="${x_libs} -lX11 -lXext -lXrender -lXcomposite -lXdamage -lXfixes"
+ else
+ x_dir=${x_dir:-/usr/X11R6}
+ x_cflags=${x_cflags:--I${x_includes:-$x_dir/include}}
+ x_libs="${x_libs:--L${x_libraries:-$x_dir/lib}} -lX11 -lXext -lXrender
-lXcomposite -lXdamage -lXfixes"
+ fi
+ ],[
+ AC_MSG_ERROR([Cannot find X headers and libraries.])
+ ]
)
+AC_SUBST(x_cflags)
+AC_SUBST(x_libs)
+
+x_cflags="-I/usr/X11R6/include"
+x_libs="-L/usr/X11R6/lib -lX11 -lXext -lXrender -lXcomposite"
+AC_SUBST(x_cflags)
+AC_SUBST(x_libs)
+
+### FIXME: module.desktop doesn't need generating (anymore)
AC_OUTPUT([
Makefile
-------------------------------------------------------------------------
This SF.net email is sponsored by: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2008.
http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
