Commit 686e8aef authored by Sebastian Pölsterl's avatar Sebastian Pölsterl

Renamed binary and package to gnome-dvb-daemon

parent 486f16ab
......@@ -44,4 +44,7 @@ depcomp
po/POTFILES
INSTALL
compile
dvb-daemon-*.tar.*
py-compile
gnome-dvb-daemon
data/org.gnome.DVB.service
gnome-dvb-daemon-*.tar.*
......@@ -12,17 +12,17 @@ AM_CPPFLAGS = \
-DPACKAGE_LOCALE_DIR=\""$(prefix)/$(DATADIRNAME)/locale"\" \
-DPACKAGE_SRC_DIR=\""$(srcdir)"\" \
-DPACKAGE_DATA_DIR=\""$(datadir)"\" \
$(DVB_DAEMON_CFLAGS) \
$(GNOME_DVB_DAEMON_CFLAGS) \
-include $(CONFIG_HEADER) \
$(NULL)
BUILT_SOURCES = \
src/dvb-daemon.vala.stamp
src/gnome-dvb-daemon.vala.stamp
$(NULL)
bin_PROGRAMS = dvb-daemon
bin_PROGRAMS = gnome-dvb-daemon
dvb_daemon_VALASOURCES = \
gnome_dvb_daemon_VALASOURCES = \
src/Cable/CableChannel.vala \
src/Cable/CableScanner.vala \
src/Satellite/SatelliteChannel.vala \
......@@ -57,35 +57,35 @@ dvb_daemon_VALASOURCES = \
src/Utils.vala \
$(NULL)
dvb_daemon_SOURCES = \
$(dvb_daemon_VALASOURCES:.vala=.c) \
$(dvb_daemon_VALASOURCES:.vala=.h) \
gnome_dvb_daemon_SOURCES = \
$(gnome_dvb_daemon_VALASOURCES:.vala=.c) \
$(gnome_dvb_daemon_VALASOURCES:.vala=.h) \
$(NULL)
vala_pkgs = \
--pkg gio-2.0 \
--pkg gio-2.0 \
--pkg dbus-glib-1 \
--pkg gstreamer-0.10 \
--pkg gee-1.0 \
--pkg gconf-2.0
src/dvb-daemon.vala.stamp: $(dvb_daemon_VALASOURCES)
src/gnome-dvb-daemon.vala.stamp: $(gnome_dvb_daemon_VALASOURCES)
$(VALAC) -C --thread --vapidir=$(top_srcdir)/vapi --pkg config $(vala_pkgs) --basedir $(top_srcdir) $^
touch $@
dvb_daemon_LDFLAGS = \
gnome_dvb_daemon_LDFLAGS = \
-Wl,--export-dynamic
dvb_daemon_LDADD = \
$(DVB_DAEMON_LIBS) \
gnome_dvb_daemon_LDADD = \
$(GNOME_DVB_DAEMON_LIBS) \
$(NULL)
EXTRA_DIST = \
intltool-extract.in \
intltool-update.in \
intltool-merge.in \
$(dvb_daemon_VALASOURCES) \
src/dvb-daemon.vala.stamp \
$(gnome_dvb_daemon_VALASOURCES) \
src/gnome-dvb-daemon.vala.stamp \
$(NULL)
DISTCLEANFILES = \
......
......@@ -4,6 +4,6 @@
srcdir=`dirname $0`
test -z "$srcdir" && srcdir=.
PKG_NAME="Projekte"
PKG_NAME="gnome-dvb-daemon"
. gnome-autogen.sh
AC_INIT([dvb-daemon], [0.1.0], [marduk@k-d-w.org], [dvb-daemon])
AC_INIT([gnome-dvb-daemon], [0.1.0], [marduk@k-d-w.org], [gnome-dvb-daemon])
AC_CONFIG_SRCDIR([Makefile.am])
AC_CONFIG_HEADERS(config.h)
AC_CONFIG_MACRO_DIR([m4])
......@@ -13,8 +13,8 @@ AC_PROG_LIBTOOL
AC_PATH_PROG(VALAC, valac, valac)
AC_SUBST(VALAC)
AH_TEMPLATE([GETTEXT_PACKAGE], [dvb-daemon])
GETTEXT_PACKAGE=dvb-daemon
AH_TEMPLATE([GETTEXT_PACKAGE], [gnome-dvb-daemon])
GETTEXT_PACKAGE=gnome-dvb-daemon
AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE, "$GETTEXT_PACKAGE")
AC_SUBST(GETTEXT_PACKAGE)
AM_GLIB_GNU_GETTEXT
......@@ -31,15 +31,15 @@ DBUS_REQUIRED=0.74
GEE_REQUIRED=0.1.4
GCONF_REQUIRED=2.6.1
PKG_CHECK_MODULES(DVB_DAEMON, glib-2.0 >= $GLIB_REQUIRED
PKG_CHECK_MODULES(GNOME_DVB_DAEMON, glib-2.0 >= $GLIB_REQUIRED
gio-2.0 >= $GIO_REQUIRED
gobject-2.0 >= $GLIB_REQUIRED
gstreamer-0.10 >= $GST_REQUIRED
dbus-glib-1 >= $DBUS_REQUIRED
gee-1.0 >= $GEE_REQUIRED
gconf-2.0 >= $GCONF_REQUIRED)
AC_SUBST(DVB_DAEMON_CFLAGS)
AC_SUBST(DVB_DAEMON_LIBS)
AC_SUBST(GNOME_DVB_DAEMON_CFLAGS)
AC_SUBST(GNOME_DVB_DAEMON_LIBS)
dnl Expansions
SHAMROCK_EXPAND_DATADIR
......
## this one is commonly used with AM_PATH_PYTHONDIR ...
dnl AM_CHECK_PYMOD(MODNAME [,SYMBOL [,ACTION-IF-FOUND [,ACTION-IF-NOT-FOUND]]])
dnl Check if a module containing a given symbol is visible to python.
AC_DEFUN([AM_CHECK_PYMOD],
[AC_REQUIRE([AM_PATH_PYTHON])
py_mod_var=`echo $1['_']$2 | sed 'y%./+-%__p_%'`
AC_MSG_CHECKING(for ifelse([$2],[],,[$2 in ])python module $1)
AC_CACHE_VAL(py_cv_mod_$py_mod_var, [
ifelse([$2],[], [prog="
import sys
try:
import $1
except ImportError:
sys.exit(1)
except:
sys.exit(0)
sys.exit(0)"], [prog="
import $1
$1.$2"])
if $PYTHON -c "$prog" 1>&AC_FD_CC 2>&AC_FD_CC
then
eval "py_cv_mod_$py_mod_var=yes"
else
eval "py_cv_mod_$py_mod_var=no"
fi
])
py_val=`eval "echo \`echo '$py_cv_mod_'$py_mod_var\`"`
if test "x$py_val" != xno; then
AC_MSG_RESULT(yes)
ifelse([$3], [],, [$3
])dnl
else
AC_MSG_RESULT(no)
ifelse([$4], [],, [$4
])dnl
fi
])
dnl a macro to check for ability to create python extensions
dnl AM_CHECK_PYTHON_HEADERS([ACTION-IF-POSSIBLE], [ACTION-IF-NOT-POSSIBLE])
dnl function also defines PYTHON_INCLUDES
AC_DEFUN([AM_CHECK_PYTHON_HEADERS],
[AC_REQUIRE([AM_PATH_PYTHON])
AC_MSG_CHECKING(for headers required to compile python extensions)
dnl deduce PYTHON_INCLUDES
py_prefix=`$PYTHON -c "import sys; print sys.prefix"`
py_exec_prefix=`$PYTHON -c "import sys; print sys.exec_prefix"`
PYTHON_INCLUDES="-I${py_prefix}/include/python${PYTHON_VERSION}"
if test "$py_prefix" != "$py_exec_prefix"; then
PYTHON_INCLUDES="$PYTHON_INCLUDES -I${py_exec_prefix}/include/python${PYTHON_VERSION}"
fi
AC_SUBST(PYTHON_INCLUDES)
dnl check if the headers exist:
save_CPPFLAGS="$CPPFLAGS"
CPPFLAGS="$CPPFLAGS $PYTHON_INCLUDES"
AC_TRY_CPP([#include <Python.h>],dnl
[AC_MSG_RESULT(found)
$1],dnl
[AC_MSG_RESULT(not found)
$2])
CPPFLAGS="$save_CPPFLAGS"
])
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment