kimcinoo
/
efl
forked from enlightenment/efl
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

autostuff improvements: 

* use non deprecated version of AC_INIT and AM_INIT_AUTOMAKE
   and check the required minimal versions.
 * add bzipped distribution archive
 * add AC_LIBTOOL_WIN32_DLL
 * forbid libtool to check fortran and c++ compilers
 * compute libtool versioning from the version of the package
 * pass the directories based on ${prefix} to the preoprocessor
   with the -D option
 * replace INCLUDES, wich is deprecated since 2001 by AM_CPPFLAGS
 * remove useless -L flags in *_la_LDFLAGS
 * remove Makefile.in on maintainer-clean rule


SVN revision: 32564
This commit is contained in:
doursse 2007-11-11 09:12:08 +00:00 committed by doursse
parent 6983cf7503
commit eb6534508d
7 changed files with 58 additions and 102 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
legacy/emotion/Makefile.am
View File

@ -6,9 +6,9 @@ MAINTAINERCLEANFILES = Makefile.in aclocal.m4 config.guess emotion.spec \
config.h.in config.sub configure install-sh \
ltconfig ltmain.sh missing mkinstalldirs \
stamp-h.in emotion_docs.tar emotion_docs.tar.gz \
emotion.c acconfig.h debian/changelog
emotion.c acconfig.h debian/changelog depcomp
bin_SCRIPTS =
bin_SCRIPTS =
EXTRA_DIST = README AUTHORS COPYING COPYING-PLAIN \
emotion.spec emotion.spec.in emotion.c.in gendoc Doxyfile \

86
legacy/emotion/configure.in
View File

@ -3,8 +3,11 @@ dnl Process this file with autoconf to produce a configure script.
# get rid of that stupid cache mechanism
rm -f config.cache
AC_INIT(configure.in)
AM_INIT_AUTOMAKE(emotion, 0.0.1.008)
AC_INIT(emotion, 0.0.1.008, enlightenment-devel@lists.sourceforge.net)
AC_PREREQ(2.52)
AC_CONFIG_SRCDIR(configure.in)
AM_INIT_AUTOMAKE(1.6 dist-bzip2)
AM_CONFIG_HEADER(config.h)
AC_C_BIGENDIAN
@ -13,73 +16,18 @@ AC_PROG_CC
AM_PROG_CC_STDC
AC_HEADER_STDC
AC_C_CONST
AM_ENABLE_SHARED
AM_PROG_LIBTOOL
if test "x${bindir}" = 'x${exec_prefix}/bin'; then
if test "x${exec_prefix}" = "xNONE"; then
if test "x${prefix}" = "xNONE"; then
bindir="${ac_default_prefix}/bin";
else
bindir="${prefix}/bin";
fi
else
if test "x${prefix}" = "xNONE"; then
bindir="${ac_default_prefix}/bin";
else
bindir="${prefix}/bin";
fi
fi
fi
AC_LIBTOOL_WIN32_DLL
define([AC_LIBTOOL_LANG_CXX_CONFIG], [:])dnl
define([AC_LIBTOOL_LANG_F77_CONFIG], [:])dnl
AC_PROG_LIBTOOL
if test "x${libdir}" = 'x${exec_prefix}/lib'; then
if test "x${exec_prefix}" = "xNONE"; then
if test "x${prefix}" = "xNONE"; then
libdir="${ac_default_prefix}/lib";
else
libdir="${prefix}/lib";
fi
else
if test "x${prefix}" = "xNONE"; then
libdir="${ac_default_prefix}/lib";
else
libdir="${prefix}/lib";
fi
fi
fi
dnl Set PACKAGE_DATA_DIR in config.h.
if test "x${prefix}" = "xNONE"; then
AC_DEFINE_UNQUOTED(PACKAGE_DATA_DIR, "${ac_default_prefix}/share/${PACKAGE}", [Shared Data Directory])
else
AC_DEFINE_UNQUOTED(PACKAGE_DATA_DIR, "${prefix}/share/${PACKAGE}", [Shared Data Directory])
fi
dnl Set PACKAGE_BIN_DIR in config.h.
if test "x${bindir}" = 'xNONE'; then
if test "x${prefix}" = "xNONE"; then
AC_DEFINE_UNQUOTED(PACKAGE_BIN_DIR, "${ac_default_prefix}/bin", [Install Location for Executables])
else
AC_DEFINE_UNQUOTED(PACKAGE_BIN_DIR, "${prefix}/bin", [Install Location for Executables])
fi
else
AC_DEFINE_UNQUOTED(PACKAGE_BIN_DIR, "${bindir}", [Install Location for Executables])
fi
dnl Set PACKAGE_LIB_DIR in config.h.
if test "x${libdir}" = 'xNONE'; then
if test "x${prefix}" = "xNONE"; then
AC_DEFINE_UNQUOTED(PACKAGE_LIB_DIR, "${ac_default_prefix}/lib", [Install Location for Libraries])
else
AC_DEFINE_UNQUOTED(PACKAGE_LIB_DIR, "${prefix}/lib", [Install Location for Libraries])
fi
else
AC_DEFINE_UNQUOTED(PACKAGE_LIB_DIR, "${libdir}", [Install Location for Libraries])
fi
dnl Set PACKAGE_SOURCE_DIR in config.h.
packagesrcdir=`cd $srcdir && pwd`
AC_DEFINE_UNQUOTED(PACKAGE_SOURCE_DIR, "${packagesrcdir}", [Source Directory])
VMAJ=`echo $PACKAGE_VERSION | awk -F . '{printf("%s", $1);}'`
VMIN=`echo $PACKAGE_VERSION | awk -F . '{printf("%s", $2);}'`
VMIC=`echo $PACKAGE_VERSION | awk -F . '{printf("%s", $3);}'`
SNAP=`echo $PACKAGE_VERSION | awk -F . '{printf("%s", $4);}'`
version_info=`expr $VMAJ + $VMIN`":$VMIC:$VMIN"
AC_SUBST(version_info)
PKG_CHECK_MODULES(EVAS, [evas >= 0.9.9])
PKG_CHECK_MODULES(EDJE, [edje >= 0.5.0])
@ -162,6 +110,7 @@ else
GSTCDDA_MSG="yes"
fi
fi
if test "$HAVE_XINE$HAVE_GSTREAMER" = "nono" ; then
AC_MSG_ERROR([Xine or Gstreamer must be installed to build emotion])
fi
@ -206,7 +155,4 @@ echo
echo " Installation.........: make install"
echo
echo " prefix.........: $prefix"
echo " binaries.......: $bindir"
echo " libraries......: $libdir"
echo " headers........: $includedir"
echo

4
legacy/emotion/data/Makefile.am
View File

@ -1,3 +1,6 @@
MAINTAINERCLEANFILES = Makefile.in
EDJE_CC = edje_cc
EDJE_FLAGS = -v -id $(top_srcdir)/data -fd $(top_srcdir)/data
@ -38,4 +41,3 @@ theme.edj: Makefile
clean-local:
rm -f *.edj

3
legacy/emotion/src/Makefile.am
View File

@ -1,3 +1,4 @@
## Process this file with automake to produce Makefile.in
MAINTAINERCLEANFILES = Makefile.in
SUBDIRS = lib bin modules

14
legacy/emotion/src/bin/Makefile.am
View File

@ -1,9 +1,15 @@
## Process this file with automake to produce Makefile.in
INCLUDES = \
MAINTAINERCLEANFILES = Makefile.in
AM_CPPFLAGS = \
-I$(top_srcdir) \
-I$(top_srcdir)/src/lib \
@EVAS_CFLAGS@ @ECORE_CFLAGS@ @EDJE_CFLAGS@
-DPACKAGE_BIN_DIR=\"$(bindir)\" \
-DPACKAGE_LIB_DIR=\"$(libdir)\" \
-DPACKAGE_DATA_DIR=\"$(datadir)/$(PACKAGE)\" \
@EVAS_CFLAGS@ \
@ECORE_CFLAGS@ \
@EDJE_CFLAGS@
bin_PROGRAMS = \
emotion_test
@ -14,5 +20,3 @@ emotion_test_main.c
emotion_test_LDADD = \
@EVAS_LIBS@ @ECORE_LIBS@ @EDJE_LIBS@ \
$(top_builddir)/src/lib/libemotion.la

17
legacy/emotion/src/lib/Makefile.am
View File

@ -1,13 +1,14 @@
## Process this file with automake to produce Makefile.in
AUTOMAKE_OPTIONS = 1.4 foreign
MAINTAINERCLEANFILES = Makefile.in
INCLUDES = -I$(top_srcdir) \
-I$(top_srcdir)/src/lib \
@EVAS_CFLAGS@ \
@ECORE_CFLAGS@
AM_CPPFLAGS = \
-I$(top_srcdir) \
-I$(top_srcdir)/src/lib \
-DPACKAGE_BIN_DIR=\"$(bindir)\" \
-DPACKAGE_LIB_DIR=\"$(libdir)\" \
-DPACKAGE_DATA_DIR=\"$(datadir)/$(PACKAGE)\" \
@EVAS_CFLAGS@ \
@ECORE_CFLAGS@
lib_LTLIBRARIES = libemotion.la
include_HEADERS = Emotion.h
@ -17,4 +18,4 @@ emotion_private.h
libemotion_la_LIBADD = @EVAS_LIBS@ @ECORE_LIBS@
libemotion_la_DEPENDENCIES = $(top_builddir)/config.h
libemotion_la_LDFLAGS = -version-info 0:1:0
libemotion_la_LDFLAGS = -version-info @version_info@

32
legacy/emotion/src/modules/Makefile.am
View File

@ -1,4 +1,5 @@
## Process this file with automake to produce Makefile.in
MAINTAINERCLEANFILES = Makefile.in
if BUILD_XINE_MODULE
XINE_LIB_NAME = xine.la
@ -8,18 +9,21 @@ if BUILD_GSTREAMER_MODULE
GSTREAMER_LIB_NAME = gstreamer.la
endif
#AUTOMAKE_OPTIONS = 1.4 foreign
AM_CPPFLAGS = \
-I$(top_srcdir) \
-I$(top_srcdir)/src/lib \
-I$(top_srcdir)/src/modules \
-DPACKAGE_BIN_DIR=\"$(bindir)\" \
-DPACKAGE_LIB_DIR=\"$(libdir)\" \
-DPACKAGE_DATA_DIR=\"$(datadir)/$(PACKAGE)\" \
@EVAS_CFLAGS@ \
@ECORE_CFLAGS@ \
@XINE_CFLAGS@ \
@GST_CFLAGS@
MAINTAINERCLEANFILES = Makefile.in
pkgdir = $(libdir)/emotion
INCLUDES = -I$(top_srcdir) \
-I$(top_srcdir)/src/lib \
-I$(top_srcdir)/src/modules \
@EVAS_CFLAGS@ @ECORE_CFLAGS@ @XINE_CFLAGS@ @GST_CFLAGS@
pkgdir = $(libdir)/emotion
pkg_LTLIBRARIES = $(XINE_LIB_NAME) $(GSTREAMER_LIB_NAME)
pkg_LTLIBRARIES = $(XINE_LIB_NAME) $(GSTREAMER_LIB_NAME)
if BUILD_XINE_MODULE
xine_la_SOURCES = \
@ -27,8 +31,7 @@ emotion_xine.c \
emotion_xine.h \
emotion_xine_vo_out.c
xine_la_LIBADD = @EVAS_LIBS@ @ECORE_LIBS@ @XINE_LIBS@ $(top_builddir)/src/lib/libemotion.la -lpthread
xine_la_LDFLAGS = -module -avoid-version \
-L$(top_builddir)/src/lib -L$(top_builddir)/src/lib/.libs
xine_la_LDFLAGS = -module -avoid-version
xine_la_DEPENDENCIES = $(top_builddir)/config.h
endif
@ -39,7 +42,6 @@ emotion_gstreamer.h \
emotion_gstreamer_pipeline.c \
emotion_gstreamer_pipeline.h
gstreamer_la_LIBADD = @EVAS_LIBS@ @ECORE_LIBS@ @GST_LIBS@ $(top_builddir)/src/lib/libemotion.la
gstreamer_la_LDFLAGS = -module -avoid-version \
-L$(top_builddir)/src/lib -L$(top_builddir)/src/lib/.libs
gstreamer_la_LDFLAGS = -module -avoid-version
gstreamer_la_DEPENDENCIES = $(top_builddir)/config.h
endif