forked from enlightenment/efl
patch from vtorri for autotools, a couple compile warning shutups
SVN revision: 49142
This commit is contained in:
parent
6ad3256a01
commit
5223f0573d
|
@ -2,19 +2,38 @@ ACLOCAL_AMFLAGS = -I m4
|
||||||
|
|
||||||
SUBDIRS = src doc
|
SUBDIRS = src doc
|
||||||
|
|
||||||
MAINTAINERCLEANFILES = Makefile.in aclocal.m4 config.guess config.h.in* \
|
MAINTAINERCLEANFILES = \
|
||||||
config.log config.sub configure depcomp \
|
Makefile.in \
|
||||||
install-sh ltmain.sh missing compile eeze*doc*tar* \
|
aclocal.m4 \
|
||||||
m4/l*
|
config.guess \
|
||||||
|
config.h.in \
|
||||||
|
config.h.in~ \
|
||||||
|
config.sub \
|
||||||
|
configure \
|
||||||
|
depcomp \
|
||||||
|
install-sh \
|
||||||
|
ltconfig \
|
||||||
|
ltmain.sh \
|
||||||
|
missing \
|
||||||
|
eeze*doc*tar* \
|
||||||
|
m4/l*
|
||||||
|
|
||||||
pkgconfigdir = $(libdir)/pkgconfig
|
pkgconfigdir = $(libdir)/pkgconfig
|
||||||
|
pkgconfig_DATA = eeze.pc
|
||||||
|
|
||||||
EEZE_PC = eeze.pc
|
EXTRA_DIST = \
|
||||||
pkgconfig_DATA = $(EEZE_PC)
|
AUTHORS \
|
||||||
|
COPYING \
|
||||||
|
README \
|
||||||
|
$(pkgconfig_DATA) \
|
||||||
|
autogen.sh \
|
||||||
|
eeze.pc.in \
|
||||||
|
m4/efl_doxygen.m4
|
||||||
|
|
||||||
.PHONY: doc
|
.PHONY: doc
|
||||||
|
|
||||||
|
# Documentation
|
||||||
|
|
||||||
doc: all
|
doc: all
|
||||||
@echo "entering doc/"
|
@echo "entering doc/"
|
||||||
$(MAKE) -C doc doc
|
$(MAKE) -C doc doc
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
# get rid of that stupid cache mechanism
|
# get rid of that stupid cache mechanism
|
||||||
rm -f config.cache
|
rm -f config.cache
|
||||||
|
|
||||||
AC_INIT([eeze], [0.5.0], [enlightenment-devel@lists.sourceforge.net])
|
AC_INIT([eeze], [0.1.0], [enlightenment-devel@lists.sourceforge.net])
|
||||||
release="ver-pre-svn-05"
|
release="ver-pre-svn-05"
|
||||||
AC_PREREQ([2.52])
|
AC_PREREQ([2.52])
|
||||||
AC_CONFIG_SRCDIR([configure.ac])
|
AC_CONFIG_SRCDIR([configure.ac])
|
||||||
|
@ -13,11 +13,8 @@ AM_INIT_AUTOMAKE([1.6 dist-bzip2])
|
||||||
AM_CONFIG_HEADER([config.h])
|
AM_CONFIG_HEADER([config.h])
|
||||||
m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
|
m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
|
||||||
|
|
||||||
AC_PROG_CC
|
|
||||||
AC_HEADER_STDC
|
|
||||||
AM_PROG_CC_C_O
|
|
||||||
|
|
||||||
define([AC_LIBTOOL_LANG_CXX_CONFIG], [:])dnl
|
define([AC_LIBTOOL_LANG_CXX_CONFIG], [:])dnl
|
||||||
|
define([AC_LIBTOOL_LANG_F77_CONFIG], [:])dnl
|
||||||
AC_PROG_LIBTOOL
|
AC_PROG_LIBTOOL
|
||||||
|
|
||||||
VMAJ=`echo $PACKAGE_VERSION | awk -F. '{printf("%s", $1);}'`
|
VMAJ=`echo $PACKAGE_VERSION | awk -F. '{printf("%s", $1);}'`
|
||||||
|
@ -29,6 +26,17 @@ eeze_release_info="-release $release"
|
||||||
AC_SUBST(version_info)
|
AC_SUBST(version_info)
|
||||||
AC_SUBST(eeze_release_info)
|
AC_SUBST(eeze_release_info)
|
||||||
|
|
||||||
|
|
||||||
|
### Needed information
|
||||||
|
|
||||||
|
requirement_eeze="ecore libudev"
|
||||||
|
|
||||||
|
|
||||||
|
### Checks for programs
|
||||||
|
AC_PROG_CC
|
||||||
|
AM_PROG_CC_C_O
|
||||||
|
|
||||||
|
# pkg-config
|
||||||
PKG_PROG_PKG_CONFIG
|
PKG_PROG_PKG_CONFIG
|
||||||
|
|
||||||
# Check whether pkg-config supports Requires.private
|
# Check whether pkg-config supports Requires.private
|
||||||
|
@ -39,8 +47,14 @@ AS_IF(
|
||||||
)
|
)
|
||||||
AC_SUBST(pkgconfig_requires_private)
|
AC_SUBST(pkgconfig_requires_private)
|
||||||
|
|
||||||
PKG_CHECK_MODULES([ECORE], [ecore])
|
# doxygen program for documentation building
|
||||||
PKG_CHECK_MODULES(UDEV, libudev)
|
|
||||||
|
EFL_CHECK_DOXYGEN([build_doc="yes"], [build_doc="no"])
|
||||||
|
|
||||||
|
|
||||||
|
### Checks for libraries
|
||||||
|
|
||||||
|
PKG_CHECK_MODULES([EEZE], [ecore libudev])
|
||||||
|
|
||||||
udev_version=$(pkg-config libudev --modversion)
|
udev_version=$(pkg-config libudev --modversion)
|
||||||
|
|
||||||
|
@ -49,14 +63,30 @@ if test $udev_version -lt 142;then
|
||||||
AC_DEFINE([OLD_UDEV_RRRRRRRRRRRRRR],[1],[compat functionality for udev < 142])
|
AC_DEFINE([OLD_UDEV_RRRRRRRRRRRRRR],[1],[compat functionality for udev < 142])
|
||||||
fi
|
fi
|
||||||
|
|
||||||
lt_enable_auto_import=""
|
|
||||||
AS_CASE(
|
|
||||||
["$host_os"],
|
|
||||||
[mingw* | cegcc*],
|
|
||||||
AC_MSG_ERROR([THIS WILL NOT RUN ON WINDOWS!])
|
|
||||||
)
|
|
||||||
|
|
||||||
EFL_CHECK_DOXYGEN([build_doc="yes"], [build_doc="no"])
|
### Checks for header files
|
||||||
|
|
||||||
|
|
||||||
|
### Checks for types
|
||||||
|
|
||||||
|
|
||||||
|
### Checks for structures
|
||||||
|
|
||||||
|
|
||||||
|
### Checks for compiler characteristics
|
||||||
|
|
||||||
|
AC_HEADER_STDC
|
||||||
|
|
||||||
|
if ! test "x${VMIC}" = "x" ; then
|
||||||
|
EFL_COMPILER_FLAG([-Wall])
|
||||||
|
EFL_COMPILER_FLAG([-W])
|
||||||
|
fi
|
||||||
|
|
||||||
|
EFL_COMPILER_FLAG([-Wshadow])
|
||||||
|
|
||||||
|
|
||||||
|
AC_SUBST(requirement_eeze)
|
||||||
|
|
||||||
|
|
||||||
AC_OUTPUT([
|
AC_OUTPUT([
|
||||||
Makefile
|
Makefile
|
||||||
|
@ -81,6 +111,7 @@ echo "------------------------------------------------------------------------"
|
||||||
echo
|
echo
|
||||||
echo "Configuration Options Summary:"
|
echo "Configuration Options Summary:"
|
||||||
echo
|
echo
|
||||||
|
echo "Documentation..........: ${build_doc}"
|
||||||
echo
|
echo
|
||||||
echo "Compilation............: make (or gmake)"
|
echo "Compilation............: make (or gmake)"
|
||||||
echo " CPPFLAGS.............: $CPPFLAGS"
|
echo " CPPFLAGS.............: $CPPFLAGS"
|
||||||
|
|
|
@ -5,7 +5,7 @@ includedir=@includedir@
|
||||||
|
|
||||||
Name: eeze
|
Name: eeze
|
||||||
Description: device convenience library for efl
|
Description: device convenience library for efl
|
||||||
@pkgconfig_requires_private@: ecore libudev
|
@pkgconfig_requires_private@: @requirement_eeze@
|
||||||
Version: @VERSION@
|
Version: @VERSION@
|
||||||
Libs: -L${libdir} -leeze
|
Libs: -L${libdir} -leeze
|
||||||
Cflags: -I${includedir}
|
Cflags: -I${includedir}
|
||||||
|
|
|
@ -2,15 +2,11 @@ MAINTAINERCLEANFILES = Makefile.in
|
||||||
|
|
||||||
EEZE_CPPFLAGS = \
|
EEZE_CPPFLAGS = \
|
||||||
-I$(top_srcdir)/src/lib \
|
-I$(top_srcdir)/src/lib \
|
||||||
@ECORE_CFLAGS@
|
@EEZE_CFLAGS@
|
||||||
|
|
||||||
LIBS = \
|
|
||||||
@ECORE_LIBS@
|
|
||||||
|
|
||||||
EEZE_UDEV_PROG = eeze_udev_test
|
EEZE_UDEV_PROG = eeze_udev_test
|
||||||
|
|
||||||
bin_PROGRAMS = \
|
bin_PROGRAMS = eeze_udev_test
|
||||||
$(EEZE_UDEV_PROG)
|
|
||||||
|
|
||||||
eeze_udev_test_SOURCES = eeze_udev_test.c
|
eeze_udev_test_SOURCES = eeze_udev_test.c
|
||||||
eeze_udev_test_CPPFLAGS = $(EEZE_CPPFLAGS)
|
eeze_udev_test_CPPFLAGS = $(EEZE_CPPFLAGS)
|
||||||
|
|
|
@ -7,7 +7,7 @@
|
||||||
#include <libudev.h>
|
#include <libudev.h>
|
||||||
|
|
||||||
#ifdef EAPI
|
#ifdef EAPI
|
||||||
#undef EAPI
|
# undef EAPI
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#ifdef __GNUC__
|
#ifdef __GNUC__
|
||||||
|
|
|
@ -1,14 +1,11 @@
|
||||||
MAINTAINERCLEANFILES = Makefile.in
|
MAINTAINERCLEANFILES = Makefile.in
|
||||||
|
|
||||||
AM_CPPFLAGS = @ECORE_CFLAGS@
|
AM_CPPFLAGS = @EEZE_CFLAGS@
|
||||||
|
|
||||||
lib_LTLIBRARIES = libeeze.la
|
lib_LTLIBRARIES = libeeze.la
|
||||||
include_HEADERS = Eeze.h
|
include_HEADERS = Eeze.h
|
||||||
|
|
||||||
noinst_HEADERS = eeze_udev_private.h eeze_private.h
|
|
||||||
|
|
||||||
libeeze_la_SOURCES = \
|
libeeze_la_SOURCES = \
|
||||||
Eeze.h \
|
|
||||||
eeze_udev.c \
|
eeze_udev.c \
|
||||||
eeze_udev_watch.c \
|
eeze_udev_watch.c \
|
||||||
eeze_main.c \
|
eeze_main.c \
|
||||||
|
@ -16,6 +13,7 @@ eeze_udev_find.c \
|
||||||
eeze_udev_walk.c \
|
eeze_udev_walk.c \
|
||||||
eeze_udev_private.c
|
eeze_udev_private.c
|
||||||
|
|
||||||
libeeze_la_LIBADD = @ECORE_LIBS@ @UDEV_LIBS@
|
libeeze_la_LIBADD = @EEZE_LIBS@
|
||||||
libeeze_la_LDFLAGS = -no-undefined -version-info @version_info@ @eeze_release_info@
|
libeeze_la_LDFLAGS = -no-undefined -version-info @version_info@ @eeze_release_info@
|
||||||
|
|
||||||
|
EXTRA_DIST = eeze_udev_private.h eeze_private.h
|
||||||
|
|
|
@ -246,7 +246,7 @@ eeze_udev_devpath_get_syspath(const char *devpath)
|
||||||
_udev_enumerate *en;
|
_udev_enumerate *en;
|
||||||
_udev_list_entry *devs, *cur;
|
_udev_list_entry *devs, *cur;
|
||||||
_udev_device *device;
|
_udev_device *device;
|
||||||
const char *name, *ret;
|
const char *name, *ret = NULL;
|
||||||
|
|
||||||
if (!devpath)
|
if (!devpath)
|
||||||
return NULL;
|
return NULL;
|
||||||
|
@ -287,7 +287,7 @@ eeze_udev_devpath_get_subsystem(const char *devpath)
|
||||||
_udev_enumerate *en;
|
_udev_enumerate *en;
|
||||||
_udev_list_entry *devs, *cur;
|
_udev_list_entry *devs, *cur;
|
||||||
_udev_device *device;
|
_udev_device *device;
|
||||||
const char *name, *ret;
|
const char *name, *ret = NULL;
|
||||||
|
|
||||||
if (!devpath)
|
if (!devpath)
|
||||||
return NULL;
|
return NULL;
|
||||||
|
|
|
@ -280,7 +280,7 @@ eeze_udev_watch_add(Eeze_Udev_Type type, int event,
|
||||||
void (*func)(const char *syspath, int event, void *data,
|
void (*func)(const char *syspath, int event, void *data,
|
||||||
Eeze_Udev_Watch * watch), void *user_data)
|
Eeze_Udev_Watch * watch), void *user_data)
|
||||||
{
|
{
|
||||||
_udev_monitor *mon;
|
_udev_monitor *mon = NULL;
|
||||||
int fd;
|
int fd;
|
||||||
Ecore_Fd_Handler *handler;
|
Ecore_Fd_Handler *handler;
|
||||||
Eeze_Udev_Watch *watch;
|
Eeze_Udev_Watch *watch;
|
||||||
|
@ -378,7 +378,7 @@ EAPI void *
|
||||||
eeze_udev_watch_del(Eeze_Udev_Watch * watch)
|
eeze_udev_watch_del(Eeze_Udev_Watch * watch)
|
||||||
{
|
{
|
||||||
struct _store_data *sdata;
|
struct _store_data *sdata;
|
||||||
void *ret;
|
void *ret = NULL;
|
||||||
|
|
||||||
if ((!watch) || (!watch->mon) || (!watch->handler))
|
if ((!watch) || (!watch->mon) || (!watch->handler))
|
||||||
return NULL;
|
return NULL;
|
||||||
|
|
Loading…
Reference in New Issue