Enlightenment CVS committal Author : doursse Project : e17 Module : libs/emotion
Dir : e17/libs/emotion/src/modules Modified Files: Makefile.am Log Message: 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 =================================================================== RCS file: /cvs/e/e17/libs/emotion/src/modules/Makefile.am,v retrieving revision 1.11 retrieving revision 1.12 diff -u -3 -r1.11 -r1.12 --- Makefile.am 31 Oct 2007 19:34:39 -0000 1.11 +++ Makefile.am 11 Nov 2007 09:12:08 -0000 1.12 @@ -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 @@ GSTREAMER_LIB_NAME = gstreamer.la endif -#AUTOMAKE_OPTIONS = 1.4 foreign - -MAINTAINERCLEANFILES = Makefile.in - -INCLUDES = -I$(top_srcdir) \ - -I$(top_srcdir)/src/lib \ - -I$(top_srcdir)/src/modules \ - @EVAS_CFLAGS@ @ECORE_CFLAGS@ @XINE_CFLAGS@ @GST_CFLAGS@ +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)\" \ [EMAIL PROTECTED]@ \ [EMAIL PROTECTED]@ \ [EMAIL PROTECTED]@ \ [EMAIL PROTECTED]@ -pkgdir = $(libdir)/emotion +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.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_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 ------------------------------------------------------------------------- This SF.net email is sponsored by: Splunk Inc. Still grepping through log files to find problems? Stop. Now Search log events and configuration files using AJAX and a browser. Download your FREE copy of Splunk now >> http://get.splunk.com/ _______________________________________________ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs