Commit c301fd22 authored by Vincent Untz's avatar Vincent Untz

Port to GTK+ 3.0, add introspection support and bump version to 2.90.1

The library should be parallel-installable with the GTK+ 2.0 version.

The python bindings were removed, and replaced by introspection support,
since it's likely that the bindings would have caused issues with GTK+
3.0.
parent 8cbf22ba
SUBDIRS = po po-locations libgweather doc data python icons
SUBDIRS = po po-locations libgweather doc data icons
ACLOCAL_AMFLAGS = -I m4
DISTCHECK_CONFIGURE_FLAGS = --enable-gtk-doc
DISTCHECK_CONFIGURE_FLAGS = --enable-gtk-doc --enable-introspection
EXTRA_DIST = \
MAINTAINERS
......
......@@ -6,6 +6,7 @@ test -z "$srcdir" && srcdir=.
PKG_NAME="libgweather"
REQUIRED_AUTOMAKE_VERSION=1.9
REQUIRED_M4MACROS=introspection.m4
(test -f $srcdir/configure.in \
&& test -d $srcdir/libgweather) || {
......
AC_INIT([libgweather],[2.31.1])
AC_PREREQ(2.59)
AC_INIT([libgweather],[2.90.1])
AC_PREREQ(2.62)
AM_CONFIG_HEADER(config.h)
AM_INIT_AUTOMAKE([1.9 no-dist-gzip dist-bzip2])
......@@ -14,7 +14,7 @@ AC_CONFIG_MACRO_DIR([m4])
# change to C+1:0:0
# - If the interface is the same as the previous version, change to C:R+1:A
LT_VERSION=7:9:6
LT_VERSION=0:0:0
AC_SUBST(LT_VERSION)
AC_CANONICAL_HOST
......@@ -30,7 +30,7 @@ esac
AC_MSG_RESULT([$gweather_native_win32])
AM_CONDITIONAL(OS_WIN32, [test "$gweather_native_win32" = "yes"])
GTK_REQUIRED=2.11.0
GTK_REQUIRED=2.90.0
GLIB_REQUIRED=2.13.0
LIBSOUP_REQUIRED=2.4.0
LIBSOUP_GNOME_REQUIRED=2.25.1
......@@ -113,8 +113,8 @@ if test "x$enable_maintainer_mode" = "xyes"; then
CFLAGS="$CFLAGS $DISABLE_DEPRECATED"
fi
dnl -- Check for GTK+ 2.0 (required) ------------------------------------------
PKG_CHECK_MODULES(GTK, gtk+-2.0 >= $GTK_REQUIRED)
dnl -- Check for GTK+ 3.0 (required) ------------------------------------------
PKG_CHECK_MODULES(GTK, gtk+-3.0 >= $GTK_REQUIRED)
GTK_CFLAGS="$GTK_CFLAGS -DGTK_DISABLE_SINGLE_INCLUDES"
AC_SUBST(GTK_CFLAGS)
AC_SUBST(GTK_LIBS)
......@@ -148,7 +148,7 @@ CFLAGS="$CFLAGS -DG_DISABLE_SINGLE_INCLUDES"
dnl gettext
GETTEXT_PACKAGE=libgweather
GETTEXT_PACKAGE=libgweather-3.0
AC_SUBST(GETTEXT_PACKAGE)
AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE, "$GETTEXT_PACKAGE", [Gettext Package])
AM_GLIB_GNU_GETTEXT
......@@ -210,24 +210,6 @@ if test -z "$ZONEINFO_DIR"; then
fi
AC_DEFINE_UNQUOTED(ZONEINFO_DIR, "$ZONEINFO_DIR", [zoneinfo directory])
dnl ***************************************************************************
dnl *** Python bindings
dnl ***************************************************************************
AC_ARG_ENABLE(python,
[AC_HELP_STRING([--enable-python],
[Build libgweather python bindings])],
[enable_python=yes],
[enable_python=no])
if test "$enable_python" = "yes"; then
AM_PATH_PYTHON()
AM_CHECK_PYTHON_HEADERS(,enable_python=no)
PKG_CHECK_MODULES(PYGOBJECT, pygobject-2.0)
pygtk_defsdir=`$PKG_CONFIG --variable=defsdir pygtk-2.0`
PYGTK_DEFS="$pygtk_defsdir/gtk.defs"
AC_SUBST(PYGTK_DEFS)
fi
AM_CONDITIONAL(BUILD_PYTHON, test "x$enable_python" = "xyes")
dnl ***************************************************************************
dnl *** Honour aclocal flags ***
dnl ***************************************************************************
......@@ -238,7 +220,6 @@ AC_SUBST(VERSION)
AC_SUBST(PACKAGE)
AC_SUBST(DATADIR)
AC_SUBST(LIBDIR)
AC_SUBST(PYTHONDIR)
AC_SUBST(GLADEDIR)
##################################################
......@@ -246,6 +227,8 @@ AC_SUBST(GLADEDIR)
##################################################
GTK_DOC_CHECK([1.9])
GOBJECT_INTROSPECTION_CHECK([0.6.7])
dnl ***************************************************************************
dnl *** Output Makefiles et al ***
dnl ***************************************************************************
......@@ -255,10 +238,9 @@ doc/Makefile
po/Makefile.in
po-locations/Makefile
libgweather/Makefile
libgweather/gweather.pc
libgweather/gweather-uninstalled.pc
libgweather/gweather-3.0.pc
libgweather/gweather-3.0-uninstalled.pc
data/Makefile
python/Makefile
icons/Makefile
])
......@@ -277,7 +259,7 @@ libgweather-$VERSION configure summary:
Prefix: ${prefix}
Source code location: ${srcdir}
Compiler: ${CC}
Python bindings: ${enable_python}
Introspection support: ${found_introspection}
Locations.xml translations: ${LOCATIONS_XML_TRANSLATIONS}
Locations.xml compression: ${enable_locations_compression}
" >&2
......@@ -4,7 +4,7 @@
AUTOMAKE_OPTIONS = 1.6
# The name of the module, e.g. 'glib'.
DOC_MODULE=libgweather
DOC_MODULE=libgweather-3.0
# Uncomment for versioned docs and specify the version of the module, e.g. '2'.
#DOC_MODULE_VERSION=2
......@@ -69,7 +69,7 @@ expand_content_files=
# e.g. GTKDOC_CFLAGS=-I$(top_srcdir) -I$(top_builddir) $(GTK_DEBUG_FLAGS)
# e.g. GTKDOC_LIBS=$(top_builddir)/gtk/$(gtktargetlib)
GTKDOC_CFLAGS = -I$(top_srcdir) $(GTK_CFLAGS) $(LIBXML_CFLAGS) $(LIBSOUP_CFLAGS) $(GCONF_CFLAGS) -DGWEATHER_I_KNOW_THIS_IS_UNSTABLE
GTKDOC_LIBS = $(top_builddir)/libgweather/libgweather.la $(GTK_LIBS) $(LIBXML_LIBS) $(LIBSOUP_LIBS) $(GCONF_LIBS)
GTKDOC_LIBS = $(top_builddir)/libgweather/libgweather-3.la $(GTK_LIBS) $(LIBXML_LIBS) $(LIBSOUP_LIBS) $(GCONF_LIBS)
# This includes the standard gtk-doc make rules, copied by gtkdocize.
include $(top_srcdir)/gtk-doc.make
......
<?xml version="1.0"?>
<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
"http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd">
<book id="index" xmlns:xi="http://www.w3.org/2001/XInclude">
"http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd"
[
<!ENTITY % local.common.attrib "xmlns:xi CDATA #FIXED 'http://www.w3.org/2003/XInclude'">
]>
<book id="index">
<bookinfo>
<title>libgweather Reference Manual</title>
<title>libgweather-3.0 Reference Manual</title>
<releaseinfo>
for libgweather [VERSION]
for libgweather-3.0 [VERSION].
The latest version of this documentation can be found on-line at
<ulink role="online-location" url="http://[SERVER]/libgweather/index.html">http://[SERVER]/libgweather/</ulink>.
<ulink role="online-location" url="http://[SERVER]/libgweather-3.0/index.html">http://[SERVER]/libgweather-3.0/</ulink>.
</releaseinfo>
</bookinfo>
<chapter>
<title>[Insert title here]</title>
<xi:include href="xml/gweather-location.xml"/>
<xi:include href="xml/location-entry.xml"/>
<xi:include href="xml/gweather-timezone.xml"/>
<xi:include href="xml/timezone-menu.xml"/>
<xi:include href="xml/location-entry.xml"/>
<xi:include href="xml/gweather-location.xml"/>
<xi:include href="xml/weather.xml"/>
<xi:include href="xml/gweather-xml.xml"/>
<xi:include href="xml/gweather-gconf.xml"/>
<xi:include href="xml/gweather-prefs.xml"/>
<xi:include href="xml/gweather-gconf.xml"/>
<xi:include href="xml/gweather-xml.xml"/>
<xi:include href="xml/gweather-timezone.xml"/>
</chapter>
<chapter id="object-tree">
<title>Object Hierarchy</title>
<xi:include href="xml/tree_index.sgml"/>
</chapter>
<index id="api-index-full">
<title>API Index</title>
<xi:include href="xml/api-index-full.xml"><xi:fallback /></xi:include>
</index>
<xi:include href="xml/annotation-glossary.xml"><xi:fallback /></xi:include>
</book>
......@@ -2,6 +2,7 @@
<FILE>timezone-menu</FILE>
<TITLE>GWeatherTimezoneMenu</TITLE>
GWeatherTimezoneMenu
GWeatherTimezoneMenuClass
gweather_timezone_menu_new
gweather_timezone_menu_set_tzid
gweather_timezone_menu_get_tzid
......@@ -19,9 +20,11 @@ GWEATHER_TIMEZONE_MENU_GET_CLASS
<FILE>location-entry</FILE>
<TITLE>GWeatherLocationEntry</TITLE>
GWeatherLocationEntry
GWeatherLocationEntryClass
gweather_location_entry_new
gweather_location_entry_set_location
gweather_location_entry_get_location
gweather_location_entry_has_custom_text
gweather_location_entry_set_city
<SUBSECTION Standard>
GWEATHER_LOCATION_ENTRY
......@@ -33,66 +36,12 @@ GWEATHER_IS_LOCATION_ENTRY_CLASS
GWEATHER_LOCATION_ENTRY_GET_CLASS
</SECTION>
<SECTION>
<FILE>gweather-timezone</FILE>
GWeatherTimezone
gweather_timezone_get_name
gweather_timezone_get_tzid
gweather_timezone_get_offset
gweather_timezone_has_dst
gweather_timezone_get_dst_offset
gweather_timezone_ref
gweather_timezone_unref
<SUBSECTION Standard>
gweather_timezone_get_type
GWEATHER_TYPE_TIMEZONE
</SECTION>
<SECTION>
<FILE>gweather-xml</FILE>
gweather_xml_load_locations
</SECTION>
<SECTION>
<FILE>gweather-gconf</FILE>
GWeatherGConf
gweather_gconf_new
gweather_gconf_free
gweather_gconf_get_client
gweather_gconf_get_location
gweather_gconf_get_full_key
gweather_gconf_set_bool
gweather_gconf_set_int
gweather_gconf_set_string
gweather_gconf_get_bool
gweather_gconf_get_int
gweather_gconf_get_string
</SECTION>
<SECTION>
<FILE>gweather-prefs</FILE>
GCONF_TEMP_UNIT
GCONF_SPEED_UNIT
GCONF_PRESSURE_UNIT
GCONF_DISTANCE_UNIT
GWeatherPrefs
gweather_prefs_load
gweather_prefs_temp_enum_to_string
gweather_prefs_speed_enum_to_string
gweather_prefs_pressure_enum_to_string
gweather_prefs_distance_enum_to_string
gweather_prefs_parse_temperature
gweather_prefs_parse_speed
gweather_prefs_get_temp_display_name
gweather_prefs_get_speed_display_name
gweather_prefs_get_pressure_display_name
gweather_prefs_get_distance_display_name
</SECTION>
<SECTION>
<FILE>gweather-location</FILE>
GWeatherLocation
GWeatherLocationLevel
gweather_location_get_type
GWEATHER_TYPE_LOCATION
gweather_location_new_world
gweather_location_ref
gweather_location_unref
......@@ -112,9 +61,6 @@ gweather_location_free_timezones
gweather_location_get_code
gweather_location_get_city_name
gweather_location_get_weather
<SUBSECTION Standard>
gweather_location_get_type
GWEATHER_TYPE_LOCATION
</SECTION>
<SECTION>
......@@ -168,6 +114,8 @@ WeatherWindDirection
WeatherSky
WeatherConditionPhenomenon
WeatherConditionQualifier
WeatherMoonPhase
WeatherMoonLatitude
weather_info_get_value_update
weather_info_get_value_sky
weather_info_get_value_conditions
......@@ -181,5 +129,64 @@ weather_info_get_value_pressure
weather_info_get_value_visibility
weather_info_get_value_sunrise
weather_info_get_value_sunset
weather_info_get_value_moonphase
weather_info_get_upcoming_moonphases
</SECTION>
<SECTION>
<FILE>gweather-prefs</FILE>
GCONF_TEMP_UNIT
GCONF_SPEED_UNIT
GCONF_PRESSURE_UNIT
GCONF_DISTANCE_UNIT
GWeatherPrefs
gweather_prefs_load
gweather_prefs_temp_enum_to_string
gweather_prefs_speed_enum_to_string
gweather_prefs_pressure_enum_to_string
gweather_prefs_distance_enum_to_string
gweather_prefs_parse_temperature
gweather_prefs_parse_speed
gweather_prefs_get_temp_display_name
gweather_prefs_get_speed_display_name
gweather_prefs_get_pressure_display_name
gweather_prefs_get_distance_display_name
</SECTION>
<SECTION>
<FILE>gweather-gconf</FILE>
GWeatherGConf
gweather_gconf_new
gweather_gconf_free
gweather_gconf_get_client
gweather_gconf_get_location
gweather_gconf_get_full_key
gweather_gconf_set_bool
gweather_gconf_set_int
gweather_gconf_set_string
gweather_gconf_get_bool
gweather_gconf_get_int
gweather_gconf_get_string
</SECTION>
<SECTION>
<FILE>gweather-xml</FILE>
gweather_xml_load_locations
gweather_xml_free_locations
</SECTION>
<SECTION>
<FILE>gweather-timezone</FILE>
GWeatherTimezone
gweather_timezone_get_type
GWEATHER_TYPE_TIMEZONE
gweather_timezone_get_name
gweather_timezone_get_tzid
gweather_timezone_get_offset
gweather_timezone_has_dst
gweather_timezone_get_dst_offset
gweather_timezone_ref
gweather_timezone_unref
gweather_timezone_get_utc
</SECTION>
gweather_location_level_get_type
gweather_timezone_get_type
gweather_timezone_menu_get_type
gweather_location_entry_get_type
gweather_location_get_type
gweather_timezone_get_type
gweather_timezone_menu_get_type
......@@ -17,6 +17,9 @@ gweather-gconf
<!-- ##### SECTION Stability_Level ##### -->
<!-- ##### SECTION Image ##### -->
<!-- ##### STRUCT GWeatherGConf ##### -->
<para>
......
......@@ -17,6 +17,9 @@ gweather-location
<!-- ##### SECTION Stability_Level ##### -->
<!-- ##### SECTION Image ##### -->
<!-- ##### STRUCT GWeatherLocation ##### -->
<para>
......@@ -36,6 +39,22 @@ gweather-location
@GWEATHER_LOCATION_CITY:
@GWEATHER_LOCATION_WEATHER_STATION:
<!-- ##### FUNCTION gweather_location_get_type ##### -->
<para>
</para>
@void:
@Returns:
<!-- ##### MACRO GWEATHER_TYPE_LOCATION ##### -->
<para>
</para>
<!-- ##### FUNCTION gweather_location_new_world ##### -->
<para>
......
......@@ -17,6 +17,9 @@ gweather-prefs
<!-- ##### SECTION Stability_Level ##### -->
<!-- ##### SECTION Image ##### -->
<!-- ##### MACRO GCONF_TEMP_UNIT ##### -->
<para>
......
......@@ -17,12 +17,31 @@ gweather-timezone
<!-- ##### SECTION Stability_Level ##### -->
<!-- ##### SECTION Image ##### -->
<!-- ##### STRUCT GWeatherTimezone ##### -->
<para>
</para>
<!-- ##### FUNCTION gweather_timezone_get_type ##### -->
<para>
</para>
@void:
@Returns:
<!-- ##### MACRO GWEATHER_TYPE_TIMEZONE ##### -->
<para>
</para>
<!-- ##### FUNCTION gweather_timezone_get_name ##### -->
<para>
......@@ -85,3 +104,12 @@ gweather-timezone
@zone:
<!-- ##### FUNCTION gweather_timezone_get_utc ##### -->
<para>
</para>
@void:
@Returns:
......@@ -17,11 +17,23 @@ gweather-xml
<!-- ##### SECTION Stability_Level ##### -->
<!-- ##### SECTION Image ##### -->
<!-- ##### FUNCTION gweather_xml_load_locations ##### -->
<para>
</para>
@void:
@Returns:
<!-- ##### FUNCTION gweather_xml_free_locations ##### -->
<para>
</para>
@locations:
......@@ -17,6 +17,9 @@ GWeatherLocationEntry
<!-- ##### SECTION Stability_Level ##### -->
<!-- ##### SECTION Image ##### -->
<!-- ##### STRUCT GWeatherLocationEntry ##### -->
<para>
......@@ -33,6 +36,13 @@ GWeatherLocationEntry
</para>
<!-- ##### STRUCT GWeatherLocationEntryClass ##### -->
<para>
</para>
@parent_class:
<!-- ##### FUNCTION gweather_location_entry_new ##### -->
<para>
......@@ -60,6 +70,15 @@ GWeatherLocationEntry
@Returns:
<!-- ##### FUNCTION gweather_location_entry_has_custom_text ##### -->
<para>
</para>
@entry:
@Returns:
<!-- ##### FUNCTION gweather_location_entry_set_city ##### -->
<para>
......
......@@ -17,6 +17,9 @@ GWeatherTimezoneMenu
<!-- ##### SECTION Stability_Level ##### -->
<!-- ##### SECTION Image ##### -->
<!-- ##### STRUCT GWeatherTimezoneMenu ##### -->
<para>
......@@ -33,6 +36,13 @@ GWeatherTimezoneMenu
</para>
<!-- ##### STRUCT GWeatherTimezoneMenuClass ##### -->
<para>
</para>
@parent_class:
<!-- ##### FUNCTION gweather_timezone_menu_new ##### -->
<para>
......
......@@ -17,6 +17,9 @@ weather
<!-- ##### SECTION Stability_Level ##### -->
<!-- ##### SECTION Image ##### -->
<!-- ##### STRUCT WeatherLocation ##### -->
<para>
......@@ -541,6 +544,18 @@ weather
@QUALIFIER_FREEZING:
@QUALIFIER_LAST:
<!-- ##### TYPEDEF WeatherMoonPhase ##### -->
<para>
</para>
<!-- ##### TYPEDEF WeatherMoonLatitude ##### -->
<para>
</para>
<!-- ##### FUNCTION weather_info_get_value_update ##### -->
<para>
......@@ -681,3 +696,24 @@ weather
@Returns:
<!-- ##### FUNCTION weather_info_get_value_moonphase ##### -->
<para>
</para>
@info:
@value:
@lat:
@Returns:
<!-- ##### FUNCTION weather_info_get_upcoming_moonphases ##### -->
<para>
</para>
@info:
@phases:
@Returns:
lib_LTLIBRARIES = libgweather.la
lib_LTLIBRARIES = libgweather-3.la
libgweatherincdir = $(includedir)/libgweather
libgweatherincdir = $(includedir)/libgweather-3.0
gweather_old_headers = \
weather.h gweather-gconf.h gweather-prefs.h gweather-xml.h
gweather_new_headers = \
......@@ -12,9 +12,9 @@ libgweatherinc_HEADERS = \
gweather-enum-types.h
pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = gweather.pc
pkgconfig_DATA = gweather-3.0.pc
libgweather_la_SOURCES = \
libgweather_3_la_SOURCES = \
weather.c weather.h weather-priv.h \
weather-metar.c weather-iwin.c weather-met.c \
weather-bom.c weather-wx.c \
......@@ -31,12 +31,12 @@ libgweather_la_SOURCES = \
parser.c parser.h
if OS_WIN32
libgweather_la_SOURCES += gweather-win32.c
libgweather_3_la_SOURCES += gweather-win32.c
else
EXTRA_libgweather_la_SOURCES = gweather-win32.c
EXTRA_libgweather_3_la_SOURCES = gweather-win32.c
endif
libgweather_la_CFLAGS = \
libgweather_3_la_CFLAGS = \
-I$(top_srcdir) \
-I$(srcdir) \
$(WARN_CFLAGS) \
......@@ -48,7 +48,7 @@ libgweather_la_CFLAGS = \
-DGNOMELOCALEDIR=\""$(datadir)/locale"\" \
-DGWEATHER_XML_LOCATION_DIR=\""$(pkgdatadir)"\"
libgweather_la_LIBADD = \
libgweather_3_la_LIBADD = \
-lm \
$(GTK_LIBS) \
$(LIBXML_LIBS) \
......@@ -56,7 +56,7 @@ libgweather_la_LIBADD = \
$(GCONF_LIBS) \
$(REGEX_LIBS)
libgweather_la_LDFLAGS = \
libgweather_3_la_LDFLAGS = \
-version-info $(LT_VERSION) -no-undefined
MKENUMS_GENERATED = gweather-enum-types.c gweather-enum-types.h
......@@ -88,7 +88,7 @@ test_metar_CFLAGS = \
test_metar_LDADD = \
$(LIBSOUP_LIBS) \
$(REGEX_LIBS) \
libgweather.la
libgweather-3.la
test_locations_SOURCES = test_locations.c
......@@ -100,7 +100,7 @@ test_locations_CFLAGS = \
$(GNOME_VFS_APPLETS_CFLAGS) \
-DG_LOG_DOMAIN=\"GWeather\"
test_locations_LDADD = libgweather.la
test_locations_LDADD = libgweather-3.la
test_sun_moon_SOURCES = \
test_sun_moon.c
......@@ -115,7 +115,7 @@ test_sun_moon_CFLAGS = \
test_sun_moon_LDADD = \
$(LIBSOUP_LIBS) \
libgweather.la
libgweather-3.la
noinst_HEADERS = weather-priv.h gweather-win32.h
noinst_PROGRAMS = test_metar test_locations test_sun_moon
......@@ -126,6 +126,49 @@ schema_DATA = $(schema_in_files:.schemas.in=.schemas)
@INTLTOOL_SCHEMAS_RULE@
EXTRA_DIST = gweather.pc.in gweather-uninstalled.pc.in $(schema_in_files)
EXTRA_PROGRAMS = test_metar test_sun_moon
CLEANFILES = $(schema_DATA) $(EXTRA_PROGRAMS) $(MKENUMS_GENERATED)
# Introspection
-include $(INTROSPECTION_MAKEFILE)
INTROSPECTION_GIRS =
INTROSPECTION_SCANNER_ARGS = --add-include-path=$(srcdir)
INTROSPECTION_COMPILER_ARGS = --includedir=$(srcdir)
if HAVE_INTROSPECTION
introspection_sources = \
weather.c weather.h \
gweather-location.c gweather-location.h \
gweather-timezone.c gweather-timezone.h \
location-entry.c location-entry.h \
timezone-menu.c timezone-menu.h \
gweather-enum-types.h
GWeather-3.0.gir: libgweather-3.la Makefile
GWeather_3_0_gir_INCLUDES = GObject-2.0 Gtk-3.0
GWeather_3_0_gir_CFLAGS = \
-I$(top_srcdir) \
$(GTK_CFLAGS) \
$(LIBXML_CFLAGS) \
$(LIBSOUP_CFLAGS) \
$(GCONF_CFLAGS) \
-DGWEATHER_I_KNOW_THIS_IS_UNSTABLE
GWeather_3_0_gir_LIBS = libgweather-3.la
GWeather_3_0_gir_FILES = $(addprefix $(srcdir)/,$(introspection_sources))
INTROSPECTION_GIRS += GWeather-3.0.gir
girdir = $(datadir)/gir-1.0
gir_DATA = $(INTROSPECTION_GIRS)
typelibdir = $(libdir)/girepository-1.0
typelib_DATA = $(INTROSPECTION_GIRS:.gir=.typelib)
CLEANFILES += $(gir_DATA) $(typelib_DATA)
endif
if GCONF_SCHEMAS_INSTALL
install-data-local:
if test -z "$(DESTDIR)" ; then \
......@@ -139,10 +182,4 @@ uninstall-local:
done
endif
EXTRA_DIST = gweather.pc.in gweather-uninstalled.pc.in $(schema_in_files)
EXTRA_PROGRAMS = test_metar test_sun_moon
CLEANFILES = $(schema_DATA) $(EXTRA_PROGRAMS) $(MKENUMS_GENERATED)
-include $(top_srcdir)/git.mk
......@@ -7,7 +7,7 @@ includedir=@includedir@
Name: GWeather
Description: GWeather shared library
Version: @VERSION@
Requires: glib-2.0 gobject-2.0 gdk-pixbuf-2.0 gtk+-2.0 gconf-2.0
Requires: glib-2.0 gobject-2.0 gdk-pixbuf-2.0 gtk+-3.0 gconf-2.0
Requires.private: libxml-2.0 libsoup-2.4
Libs: ${pc_top_builddir}/${pcfiledir}/libgweather.la
Cflags: -I${pc_top_builddir}/${pcfiledir}/..
......@@ -7,7 +7,7 @@ includedir=@includedir@
Name: GWeather
Description: GWeather shared library
Version: @VERSION@
Requires: glib-2.0 gobject-2.0 gdk-pixbuf-2.0 gtk+-2.0 gconf-2.0
Requires: glib-2.0 gobject-2.0 gdk-pixbuf-2.0 gtk+-3.0 gconf-2.0
Requires.private: libxml-2.0 libsoup-2.4
Libs: -L${libdir} -lgweather
Libs.private: -lm
......
if BUILD_PYTHON
INCLUDES = \
-I$(top_srcdir) \
$(PYTHON_INCLUDES) \
$(PYGOBJECT_CFLAGS) \
$(GTK_CFLAGS)
pyunstabledir = $(pyexecdir)/gweather/I_KNOW_THIS_IS_UNSTABLE