Enlightenment SVN wrote:
> Log:
> Fix module build (Use pkgconfig instead of deprecated enlightenment-config).
enlightenment-config is still needed for --module-dir, so it isn't
deprecated, and if modules don't use it they should :)
Sebastian
>
>
>
> Author: cedric
> Date: 2008-10-14 09:02:00 -0700 (Tue, 14 Oct 2008)
> New Revision: 36660
>
> Modified:
> trunk/E-MODULES-EXTRA/forecasts/Makefile.am
> trunk/E-MODULES-EXTRA/forecasts/configure.in
> trunk/E-MODULES-EXTRA/skel/Makefile.am
> trunk/E-MODULES-EXTRA/skel/configure.in
> trunk/E-MODULES-EXTRA/skel/src/Makefile.am
>
> Modified: trunk/E-MODULES-EXTRA/forecasts/Makefile.am
> ===
> --- trunk/E-MODULES-EXTRA/forecasts/Makefile.am 2008-10-14 15:37:29 UTC
> (rev 36659)
> +++ trunk/E-MODULES-EXTRA/forecasts/Makefile.am 2008-10-14 16:02:00 UTC
> (rev 36660)
> @@ -23,7 +23,7 @@
> INCLUDES = -I. \
> -I$(top_srcdir) \
> -I$(includedir) \
> -@e_cflags@
> +@E_CFLAGS@
>
> pkgdir = $(datadir)/$(MODULE_ARCH)
> pkg_LTLIBRARIES= module.la
> @@ -31,8 +31,8 @@
>e_mod_main.h \
>e_mod_config.c \
>e_mod_config.h
> -
> -module_la_LIBADD = @e_libs@
> +
> +module_la_LIBADD = @E_LIBS@
> module_la_LDFLAGS = -module -avoid-version
> module_la_DEPENDENCIES = $(top_builddir)/config.h
>
>
> Modified: trunk/E-MODULES-EXTRA/forecasts/configure.in
> ===
> --- trunk/E-MODULES-EXTRA/forecasts/configure.in 2008-10-14 15:37:29 UTC
> (rev 36659)
> +++ trunk/E-MODULES-EXTRA/forecasts/configure.in 2008-10-14 16:02:00 UTC
> (rev 36660)
> @@ -31,12 +31,7 @@
>
> AC_PATH_PROG(EDJE_CC, "edje_cc", "", $PATH)
>
> -AC_PATH_PROG(E_CONFIG, "enlightenment-config", "", $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)
> +PKG_CHECK_MODULES(E, [enlightenment])
>
> datadir="${e_modules}/${PACKAGE}"
> AC_ARG_ENABLE(homedir-install,
>
> Modified: trunk/E-MODULES-EXTRA/skel/Makefile.am
> ===
> --- trunk/E-MODULES-EXTRA/skel/Makefile.am2008-10-14 15:37:29 UTC (rev
> 36659)
> +++ trunk/E-MODULES-EXTRA/skel/Makefile.am2008-10-14 16:02:00 UTC (rev
> 36660)
> @@ -25,4 +25,4 @@
>rm -rf e-module-skel.edj module.desktop *~
> uninstall:
>rm -rf $(DESTDIR)$(datadir)
> -
> +
>
> Modified: trunk/E-MODULES-EXTRA/skel/configure.in
> ===
> --- trunk/E-MODULES-EXTRA/skel/configure.in 2008-10-14 15:37:29 UTC (rev
> 36659)
> +++ trunk/E-MODULES-EXTRA/skel/configure.in 2008-10-14 16:02:00 UTC (rev
> 36660)
> @@ -32,12 +32,7 @@
>
> AC_PATH_PROG(EDJE_CC, "edje_cc", "", $PATH)
>
> -AC_PATH_PROG(E_CONFIG, "enlightenment-config", "", $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)
> +PKG_CHECK_MODULES(E, [enlightenment])
>
> datadir="${e_modules}/${PACKAGE}"
> AC_ARG_ENABLE(homedir-install,
>
> Modified: trunk/E-MODULES-EXTRA/skel/src/Makefile.am
> ===
> --- trunk/E-MODULES-EXTRA/skel/src/Makefile.am2008-10-14 15:37:29 UTC
> (rev 36659)
> +++ trunk/E-MODULES-EXTRA/skel/src/Makefile.am2008-10-14 16:02:00 UTC
> (rev 36660)
> @@ -3,15 +3,15 @@
> INCLUDES = -I. \
>-I$(top_srcdir) \
>-I$(includedir) \
> - @e_cflags@
> + @E_CFLAGS@
>
> pkgdir = $(datadir)/$(MODULE_ARCH)
> pkg_LTLIBRARIES = module.la
> module_la_SOURCES = e_mod_main.h \
> e_mod_main.c \
> e_mod_config.c
> -
> -module_la_LIBADD = @e_libs@
> +
> +module_la_LIBADD = @E_LIBS@
> module_la_LDFLAGS = -module -avoid-version
> module_la_DEPENDENCIES = $(top_builddir)/config.h
>
>
>
> -
> This SF.Net email is sponsored by the Moblin Your Move Developer's challenge
> Build the coolest Linux based applications with Moblin SDK & win great prizes
> Grand prize is a trip for two to an Open Source event anywhere in the world
> http://moblin-contest.org/redirect.php?banner_id=100&url=/
> ___
> enlightenment-svn mailing list
> [EMAIL PROTECTED]
> https://lists.sourceforge.net/lists/listinfo/enlightenment-svn
-
This SF.Net email is sponsored by the Moblin Your Move Developer's challenge
Build the coolest Linux based applica
