[girl] Build GTK+ 3.0 executable (gnome-internet-radio-locator)
- From: ole <ole src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [girl] Build GTK+ 3.0 executable (gnome-internet-radio-locator)
- Date: Fri, 17 Mar 2017 16:08:29 +0000 (UTC)
commit 349455b840c2300758bd2de84d2d28c7419d2927
Author: Ole Aamot <oka oka no>
Date: Fri Mar 17 17:07:06 2017 +0100
Build GTK+ 3.0 executable (gnome-internet-radio-locator)
configure | 196 +++++++++++++++++++++++++++++++++++++++++++++++++++----
configure.ac | 16 ++++-
src/GIRL.c | 13 ++--
src/Makefile.am | 38 ++++++++---
4 files changed, 234 insertions(+), 29 deletions(-)
---
diff --git a/configure b/configure
index d542d2f..a8420ac 100755
--- a/configure
+++ b/configure
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for girl 9.9.1.
+# Generated by GNU Autoconf 2.69 for girl 9.9.2.
#
#
# Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc.
@@ -577,8 +577,8 @@ MAKEFLAGS=
# Identity of this package.
PACKAGE_NAME='girl'
PACKAGE_TARNAME='girl'
-PACKAGE_VERSION='9.9.1'
-PACKAGE_STRING='girl 9.9.1'
+PACKAGE_VERSION='9.9.2'
+PACKAGE_STRING='girl 9.9.2'
PACKAGE_BUGREPORT=''
PACKAGE_URL=''
@@ -629,6 +629,7 @@ HELP_DIR
YELP_LC_DIST
YELP_LC_MEDIA_LINKS
LN_S
+GNOME_INTERNET_RADIO_LOCATOR_PKG_DEPS
GIRL_PKG_DEPS
GETTEXT_PACKAGE
ALL_LINGUAS
@@ -701,6 +702,8 @@ GTKDOC_MKPDF
GTKDOC_REBASE
GTKDOC_CHECK_PATH
GTKDOC_CHECK
+GNOME_INTERNET_RADIO_LOCATOR_LIBS
+GNOME_INTERNET_RADIO_LOCATOR_CFLAGS
GIRL_LIBS
GIRL_CFLAGS
PKG_CONFIG_LIBDIR
@@ -772,6 +775,7 @@ infodir
docdir
oldincludedir
includedir
+runstatedir
localstatedir
sharedstatedir
sysconfdir
@@ -817,6 +821,8 @@ PKG_CONFIG_PATH
PKG_CONFIG_LIBDIR
GIRL_CFLAGS
GIRL_LIBS
+GNOME_INTERNET_RADIO_LOCATOR_CFLAGS
+GNOME_INTERNET_RADIO_LOCATOR_LIBS
GTKDOC_DEPS_CFLAGS
GTKDOC_DEPS_LIBS
CPP
@@ -860,6 +866,7 @@ datadir='${datarootdir}'
sysconfdir='${prefix}/etc'
sharedstatedir='${prefix}/com'
localstatedir='${prefix}/var'
+runstatedir='${localstatedir}/run'
includedir='${prefix}/include'
oldincludedir='/usr/include'
docdir='${datarootdir}/doc/${PACKAGE_TARNAME}'
@@ -1112,6 +1119,15 @@ do
| -silent | --silent | --silen | --sile | --sil)
silent=yes ;;
+ -runstatedir | --runstatedir | --runstatedi | --runstated \
+ | --runstate | --runstat | --runsta | --runst | --runs \
+ | --run | --ru | --r)
+ ac_prev=runstatedir ;;
+ -runstatedir=* | --runstatedir=* | --runstatedi=* | --runstated=* \
+ | --runstate=* | --runstat=* | --runsta=* | --runst=* | --runs=* \
+ | --run=* | --ru=* | --r=*)
+ runstatedir=$ac_optarg ;;
+
-sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb)
ac_prev=sbindir ;;
-sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \
@@ -1249,7 +1265,7 @@ fi
for ac_var in exec_prefix prefix bindir sbindir libexecdir datarootdir \
datadir sysconfdir sharedstatedir localstatedir includedir \
oldincludedir docdir infodir htmldir dvidir pdfdir psdir \
- libdir localedir mandir
+ libdir localedir mandir runstatedir
do
eval ac_val=\$$ac_var
# Remove trailing slashes.
@@ -1362,7 +1378,7 @@ if test "$ac_init_help" = "long"; then
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures girl 9.9.1 to adapt to many kinds of systems.
+\`configure' configures girl 9.9.2 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1402,6 +1418,7 @@ Fine tuning of the installation directories:
--sysconfdir=DIR read-only single-machine data [PREFIX/etc]
--sharedstatedir=DIR modifiable architecture-independent data [PREFIX/com]
--localstatedir=DIR modifiable single-machine data [PREFIX/var]
+ --runstatedir=DIR modifiable per-process data [LOCALSTATEDIR/run]
--libdir=DIR object code libraries [EPREFIX/lib]
--includedir=DIR C header files [PREFIX/include]
--oldincludedir=DIR C header files for non-gcc [/usr/include]
@@ -1428,7 +1445,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of girl 9.9.1:";;
+ short | recursive ) echo "Configuration of girl 9.9.2:";;
esac
cat <<\_ACEOF
@@ -1469,6 +1486,12 @@ Some influential environment variables:
path overriding pkg-config's built-in search path
GIRL_CFLAGS C compiler flags for GIRL, overriding pkg-config
GIRL_LIBS linker flags for GIRL, overriding pkg-config
+ GNOME_INTERNET_RADIO_LOCATOR_CFLAGS
+ C compiler flags for GNOME_INTERNET_RADIO_LOCATOR, overriding
+ pkg-config
+ GNOME_INTERNET_RADIO_LOCATOR_LIBS
+ linker flags for GNOME_INTERNET_RADIO_LOCATOR, overriding
+ pkg-config
GTKDOC_DEPS_CFLAGS
C compiler flags for GTKDOC_DEPS, overriding pkg-config
GTKDOC_DEPS_LIBS
@@ -1543,7 +1566,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-girl configure 9.9.1
+girl configure 9.9.2
generated by GNU Autoconf 2.69
Copyright (C) 2012 Free Software Foundation, Inc.
@@ -1908,7 +1931,7 @@ cat >config.log <<_ACEOF
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by girl $as_me 9.9.1, which was
+It was created by girl $as_me 9.9.2, which was
generated by GNU Autoconf 2.69. Invocation command line was
$ $0 $@
@@ -2771,7 +2794,7 @@ fi
# Define the identity of the package.
PACKAGE='girl'
- VERSION='9.9.1'
+ VERSION='9.9.2'
cat >>confdefs.h <<_ACEOF
@@ -4273,6 +4296,145 @@ fi 2>&5
GIRL_PKG_DEPS="gtk+-2.0, glib-2.0, libgnome-2.0, libgnomeui-2.0, libxml-2.0, gnome-vfs-2.0, gstreamer-1.0
gstreamer-video-1.0"
+pkg_failed=no
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GNOME_INTERNET_RADIO_LOCATOR" >&5
+$as_echo_n "checking for GNOME_INTERNET_RADIO_LOCATOR... " >&6; }
+
+if test -n "$GNOME_INTERNET_RADIO_LOCATOR_CFLAGS"; then
+ pkg_cv_GNOME_INTERNET_RADIO_LOCATOR_CFLAGS="$GNOME_INTERNET_RADIO_LOCATOR_CFLAGS"
+ elif test -n "$PKG_CONFIG"; then
+ if test -n "$PKG_CONFIG" && \
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gtk+-3.0 >= 3.0 \\
+ pangoft2 >= 0.28 \\
+ champlain-gtk-0.12 >= 0.12.10 \\
+ libxml-2.0 >= 2.0 \\
+ gstreamer-1.0 >= 1.0 \\
+ gstreamer-video-1.0\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "gtk+-3.0 >= 3.0 \
+ pangoft2 >= 0.28 \
+ champlain-gtk-0.12 >= 0.12.10 \
+ libxml-2.0 >= 2.0 \
+ gstreamer-1.0 >= 1.0 \
+ gstreamer-video-1.0") 2>&5
+ ac_status=$?
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }; then
+ pkg_cv_GNOME_INTERNET_RADIO_LOCATOR_CFLAGS=`$PKG_CONFIG --cflags "gtk+-3.0 >= 3.0 \
+ pangoft2 >= 0.28 \
+ champlain-gtk-0.12 >= 0.12.10 \
+ libxml-2.0 >= 2.0 \
+ gstreamer-1.0 >= 1.0 \
+ gstreamer-video-1.0" 2>/dev/null`
+ test "x$?" != "x0" && pkg_failed=yes
+else
+ pkg_failed=yes
+fi
+ else
+ pkg_failed=untried
+fi
+if test -n "$GNOME_INTERNET_RADIO_LOCATOR_LIBS"; then
+ pkg_cv_GNOME_INTERNET_RADIO_LOCATOR_LIBS="$GNOME_INTERNET_RADIO_LOCATOR_LIBS"
+ elif test -n "$PKG_CONFIG"; then
+ if test -n "$PKG_CONFIG" && \
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gtk+-3.0 >= 3.0 \\
+ pangoft2 >= 0.28 \\
+ champlain-gtk-0.12 >= 0.12.10 \\
+ libxml-2.0 >= 2.0 \\
+ gstreamer-1.0 >= 1.0 \\
+ gstreamer-video-1.0\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "gtk+-3.0 >= 3.0 \
+ pangoft2 >= 0.28 \
+ champlain-gtk-0.12 >= 0.12.10 \
+ libxml-2.0 >= 2.0 \
+ gstreamer-1.0 >= 1.0 \
+ gstreamer-video-1.0") 2>&5
+ ac_status=$?
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }; then
+ pkg_cv_GNOME_INTERNET_RADIO_LOCATOR_LIBS=`$PKG_CONFIG --libs "gtk+-3.0 >= 3.0 \
+ pangoft2 >= 0.28 \
+ champlain-gtk-0.12 >= 0.12.10 \
+ libxml-2.0 >= 2.0 \
+ gstreamer-1.0 >= 1.0 \
+ gstreamer-video-1.0" 2>/dev/null`
+ test "x$?" != "x0" && pkg_failed=yes
+else
+ pkg_failed=yes
+fi
+ else
+ pkg_failed=untried
+fi
+
+
+
+if test $pkg_failed = yes; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+
+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+ _pkg_short_errors_supported=yes
+else
+ _pkg_short_errors_supported=no
+fi
+ if test $_pkg_short_errors_supported = yes; then
+ GNOME_INTERNET_RADIO_LOCATOR_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags
--libs "gtk+-3.0 >= 3.0 \
+ pangoft2 >= 0.28 \
+ champlain-gtk-0.12 >= 0.12.10 \
+ libxml-2.0 >= 2.0 \
+ gstreamer-1.0 >= 1.0 \
+ gstreamer-video-1.0" 2>&1`
+ else
+ GNOME_INTERNET_RADIO_LOCATOR_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "gtk+-3.0
= 3.0 \
+ pangoft2 >= 0.28 \
+ champlain-gtk-0.12 >= 0.12.10 \
+ libxml-2.0 >= 2.0 \
+ gstreamer-1.0 >= 1.0 \
+ gstreamer-video-1.0" 2>&1`
+ fi
+ # Put the nasty error message in config.log where it belongs
+ echo "$GNOME_INTERNET_RADIO_LOCATOR_PKG_ERRORS" >&5
+
+ as_fn_error $? "Package requirements (gtk+-3.0 >= 3.0 \
+ pangoft2 >= 0.28 \
+ champlain-gtk-0.12 >= 0.12.10 \
+ libxml-2.0 >= 2.0 \
+ gstreamer-1.0 >= 1.0 \
+ gstreamer-video-1.0) were not met:
+
+$GNOME_INTERNET_RADIO_LOCATOR_PKG_ERRORS
+
+Consider adjusting the PKG_CONFIG_PATH environment variable if you
+installed software in a non-standard prefix.
+
+Alternatively, you may set the environment variables GNOME_INTERNET_RADIO_LOCATOR_CFLAGS
+and GNOME_INTERNET_RADIO_LOCATOR_LIBS to avoid the need to call pkg-config.
+See the pkg-config man page for more details." "$LINENO" 5
+elif test $pkg_failed = untried; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+as_fn_error $? "The pkg-config script could not be found or is too old. Make sure it
+is in your PATH or set the PKG_CONFIG environment variable to the full
+path to pkg-config.
+
+Alternatively, you may set the environment variables GNOME_INTERNET_RADIO_LOCATOR_CFLAGS
+and GNOME_INTERNET_RADIO_LOCATOR_LIBS to avoid the need to call pkg-config.
+See the pkg-config man page for more details.
+
+To get pkg-config, see <http://pkg-config.freedesktop.org/>.
+See \`config.log' for more details" "$LINENO" 5; }
+else
+ GNOME_INTERNET_RADIO_LOCATOR_CFLAGS=$pkg_cv_GNOME_INTERNET_RADIO_LOCATOR_CFLAGS
+ GNOME_INTERNET_RADIO_LOCATOR_LIBS=$pkg_cv_GNOME_INTERNET_RADIO_LOCATOR_LIBS
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+
+fi 2>&5
+
+GNOME_INTERNET_RADIO_LOCATOR_PKG_DEPS="gtk+-3.0 pangoft2 champlain-gtk-0.12 libxml-2.0, gstreamer-1.0
gstreamer-video-1.0"
+
+
gtk_doc_requires="gtk-doc >= 1.16"
@@ -6403,6 +6565,10 @@ _ACEOF
+
+
+
+
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ln -s works" >&5
$as_echo_n "checking whether ln -s works... " >&6; }
LN_S=$as_ln_s
@@ -6671,7 +6837,13 @@ install-help: $(_HELP_LC_FILES)
elif test "x$$lc" != "xC"; then \
if test "x$(YELP_LC_MEDIA_LINKS)" != "x"; then \
echo "$(LN_S) -f $(HELP_DIR)/C/$(HELP_ID)/$$f $$helpdir$$f"; \
- $(LN_S) -f "$(HELP_DIR)/C/$(HELP_ID)/$$f" "$$helpdir$$f" || exit 1; \
+ dname="$$f"; \
+ pars="../"; \
+ while test "$$dname" != "." -a "$$dname" != "/"; do \
+ pars="../$$pars"; \
+ dname=$$(dirname "$$dname"); \
+ done; \
+ $(LN_S) -f $$pars"C/$(HELP_ID)/$$f" "$$helpdir$$f" || exit 1; \
fi; \
fi; \
done; \
@@ -7267,7 +7439,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by girl $as_me 9.9.1, which was
+This file was extended by girl $as_me 9.9.2, which was
generated by GNU Autoconf 2.69. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -7333,7 +7505,7 @@ _ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
-girl config.status 9.9.1
+girl config.status 9.9.2
configured by $0, generated by GNU Autoconf 2.69,
with options \\"\$ac_cs_config\\"
diff --git a/configure.ac b/configure.ac
index 76c4a02..151ed25 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2,7 +2,7 @@
# Process this file with autoconf to produce a configure script.
AC_PREREQ(2.59)
-AC_INIT(girl, 9.9.1)
+AC_INIT(girl,9.9.2)
AM_INIT_AUTOMAKE([no-dist-gzip dist-xz])
AC_CONFIG_SRCDIR([src/girl.c])
AC_CONFIG_HEADER([config.h])
@@ -44,6 +44,16 @@ PKG_CHECK_MODULES(GIRL,
GIRL_PKG_DEPS="gtk+-2.0, glib-2.0, libgnome-2.0, libgnomeui-2.0, libxml-2.0, gnome-vfs-2.0, gstreamer-1.0
gstreamer-video-1.0"
+PKG_CHECK_MODULES(GNOME_INTERNET_RADIO_LOCATOR,
+ gtk+-3.0 >= 3.0 \
+ pangoft2 >= 0.28 \
+ champlain-gtk-0.12 >= 0.12.10 \
+ libxml-2.0 >= 2.0 \
+ gstreamer-1.0 >= 1.0 \
+ gstreamer-video-1.0) 2>&5
+
+GNOME_INTERNET_RADIO_LOCATOR_PKG_DEPS="gtk+-3.0 pangoft2 champlain-gtk-0.12 libxml-2.0, gstreamer-1.0
gstreamer-video-1.0"
+
GTK_DOC_CHECK([1.16], [--flavour no-tmpl])
# Checks for header files.
@@ -71,6 +81,10 @@ AC_SUBST(GIRL_LIBS)
AC_SUBST(GIRL_CFLAGS)
AC_SUBST(GIRL_PKG_DEPS)
+AC_SUBST(GNOME_INTERNET_RADIO_LOCATOR_LIBS)
+AC_SUBST(GNOME_INTERNET_RADIO_LOCATOR_CFLAGS)
+AC_SUBST(GNOME_INTERNET_RADIO_LOCATOR_PKG_DEPS)
+
dnl Enable yelp-tools
YELP_HELP_INIT
diff --git a/src/GIRL.c b/src/GIRL.c
index a2b8530..669ba53 100644
--- a/src/GIRL.c
+++ b/src/GIRL.c
@@ -1,5 +1,4 @@
#include <gtk/gtk.h>
-#include <gtk/gtkdialog.h>
#include <champlain/champlain.h>
#include <champlain-gtk/champlain-gtk.h>
#include <clutter-gtk/clutter-gtk.h>
@@ -7,7 +6,7 @@
#include <string.h>
static ChamplainView *champlain_view;
-GtkApplication *app;
+GApplication *app;
GtkWidget *search_selector;
GtkWidget *window;
@@ -72,7 +71,7 @@ quit_program(GSimpleAction *simple, GVariant *parameter, gpointer user_data) {
}
static void
-girl_window (GtkApplication *app,
+girl_window_cb (GApplication *app,
gpointer user_data)
{
GtkWidget *widget, *grid, *toolbar, *new, *search, *listen, *pause, *prev, *stations, *next, *station,
*program, *quit;
@@ -152,10 +151,10 @@ girl_window (GtkApplication *app,
g_signal_connect(quit, "clicked", G_CALLBACK (quit_program), GTK_WINDOW (window));
grid = gtk_grid_new();
- gtk_grid_attach (GTK_GRID(grid), toolbar, 0, 0, 1, 1);
- gtk_grid_attach (GTK_GRID(grid), widget, 0, 1, 1, 1);
+ gtk_grid_attach (GTK_GRID(grid), GTK_WIDGET(toolbar), 0, 0, 1, 1);
+ gtk_grid_attach (GTK_GRID(grid), GTK_WIDGET(widget), 0, 1, 1, 1);
champlain_view = gtk_champlain_embed_get_view (GTK_CHAMPLAIN_EMBED(widget));
- gtk_widget_set_size_request(widget, 1440, 720);
+ gtk_widget_set_size_request(GTK_WIDGET(widget), 1440, 720);
gtk_container_add (GTK_CONTAINER(window), GTK_WIDGET(grid));
g_signal_connect (window, "destroy", G_CALLBACK(gtk_main_quit), NULL);
gtk_window_set_title (GTK_WINDOW(window), "GNOME Internet Radio Locator");
@@ -174,7 +173,7 @@ main (int argc,
return 1;
app = gtk_application_new ("software.girl.gtk", G_APPLICATION_FLAGS_NONE);
- g_signal_connect (app, "activate", G_CALLBACK (girl_window), NULL);
+ g_signal_connect (app, "activate", G_CALLBACK (girl_window_cb), NULL);
status = g_application_run (G_APPLICATION (app), argc, argv);
g_object_unref (app);
diff --git a/src/Makefile.am b/src/Makefile.am
index c34b971..bc07e78 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,12 +1,12 @@
-AM_CPPFLAGS = $(GIRL_CFLAGS) \
- $(NULL)
+#AM_CPPFLAGS = $(GIRL_CFLAGS) $(GNOME_INTERNET_RADIO_LOCATOR_CFLAGS) \
+# $(NULL)
-AM_CFLAGS = $(GIRL_CFLAGS) \
- -DGIRL_DATADIR="\"$(pkgdatadir)\"" \
- $(NULL)
+#AM_CFLAGS = $(GIRL_CFLAGS) $(GNOME_INTERNET_RADIO_LOCATOR_CFLAGS) \
+# -DGIRL_DATADIR="\"$(pkgdatadir)\"" \
+# $(NULL)
-AM_LDFLAGS= $(GIRL_LIBS)
+#AM_LDFLAGS= $(GIRL_LIBS) $(GNOME_INTERNET_RADIO_LOCATOR_LIBS)
noinst_PROGRAMS = test-stations-gfx test-endianess test-stations
@@ -22,7 +22,7 @@ test_endianess_SOURCES = test-endianess.c date-endian.c date-endian.h
test_endianess_LDADD = $(GIRL_LIBS)
test_endianess_CFLAGS = $(GIRL_CFLAGS) -DGIRL_DATADIR="\"$(pkgdatadir)\""
-bin_PROGRAMS = girl
+bin_PROGRAMS = girl gnome-internet-radio-locator
girl_SOURCES = \
girl-gui.c \
@@ -41,6 +41,17 @@ girl_SOURCES = \
girl-tz.c \
girl.c
+gnome_internet_radio_locator_SOURCES = \
+ GIRL-GUI.c \
+ GIRL-LISTENER.c\
+ GIRL-PROGRAM.c \
+ GIRL-RUNNERS.c \
+ GIRL-STATION.c \
+ GIRL-STATIONS-MAP.c \
+ GIRL-STREAMS.c \
+ GIRL-TZ.c \
+ GIRL.c
+
girl_CFLAGS = $(GIRL_CFLAGS) \
-DGIRL_DATADIR=\"$(datadir)/girl\" \
-DDATADIR=\"$(datadir)\" \
@@ -48,13 +59,22 @@ girl_CFLAGS = $(GIRL_CFLAGS) \
-DGIRL_CFG \
-DGNOMELOCALEDIR=\"$(datadir)/locale\"
+gnome_internet_radio_locator_CFLAGS = $(GNOME_INTERNET_RADIO_LOCATOR_CFLAGS) \
+ -DGIRL_DATADIR=\"$(datadir)/girl\" \
+ -DDATADIR=\"$(datadir)\" \
+ -DGIRL_DEBUG=1 \
+ -DGIRL_CFG \
+ -DGNOMELOCALEDIR=\"$(datadir)/locale\"
+
girl_LDADD = $(GIRL_LIBS)
+gnome_internet_radio_locator_LDADD = $(GNOME_INTERNET_RADIO_LOCATOR_LIBS)
+
girldir = $(datadir)/girl
-girl_DATA = girl-9.8.dtd girl-logo.png girl.png girl.xml girl.xsl
+girl_DATA = girl-9.9.dtd girl-logo.png girl.png girl.xml girl.xsl
-EXTRA_DIST = girl.h girl-station.h girl-stations-map.h girl-tz.h girl-gui.h girl-listener.h girl-player.h
girl-player-globals.h girl-player-frontend.h girl-player-backend.h girl-record.h girl-record-backend.h
girl-record-globals.h girl-record-frontend.h girl-program.h girl-runners.h girl-streams.h girl-9.8.dtd
girl-map.png girl-logo.png girl.png girl.xml girl.xsl
+EXTRA_DIST = GIRL.h GIRL-STATION.h GIRL-STATIONS-MAP.h GIRL-TZ.h GIRL-GUI.h GIRL-LISTENER.h GIRL-PROGRAM.h
GIRL-RUNNERS.h GIRL-STREAMS.h girl.h girl-station.h girl-stations-map.h girl-tz.h girl-gui.h girl-listener.h
girl-player.h girl-player-globals.h girl-player-frontend.h girl-player-backend.h girl-record.h
girl-record-backend.h girl-record-globals.h girl-record-frontend.h girl-program.h girl-runners.h
girl-streams.h girl-9.8.dtd girl-map.png girl-logo.png girl.png girl.xml girl.xsl
all-local: check-local
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]