← Back to branch summary

~dobey/ubuntu/precise/avahi/bring-back-gir

« back to all changes in this revision

Viewing changes to avahi-ui/Makefile.am

  • Committer: Bazaar Package Importer
  • Author(s): Robert Ancell
  • Date: 2009-05-06 14:04:57 UTC
  • mfrom: (4.1.13 sid)
  • Revision ID: james.westby@ubuntu.com-20090506140457-72h3msg32nuc4j7v
Tags: 0.6.27-2ubuntu1
* Merge from Debian unstable, remaining Ubuntu changes:
* debian/control:
  - Remove linux-any as it is not yet supported by Soyuz
  - Add versioned dependency on the dbus that satisfies our upstart job
    dependency.
  - Add udebs corresponding to libavahi-common3 and libavahi-core6, so that
    we can use them for Eucalyptus integration in the installer.
  - Recommend dhcp3-client instead of isc-dhcp-client (not yet available in
    Ubuntu)
* debian/rules:
* debian/avahi-daemon.init:
* debian/avahi-dnsconfd.init:
  - Avahi init scripts (daemon or dnsconfd) do not need to
    be started before gdm, and do not need to be stopped specially on
    shutdown.
* debian/avahi-daemon.postinst:
* debian/avahi-dnsconfd.postinst:
  - Use Ubuntu versions for migration scripts
* debian/avahi-autoipd.preinst:
* debian/avahi-autoipd.install:
* debian/avahi-autoipd.postinst:
* debian/avahi-autoipd.postrm:
  - Disable DHCP 3 to 4 migration (not yet in Ubuntu)
* debian/avahi-daemon.upstart:
* debian/avahi-dnsconfd.upstart:
  - Add Upstart config
* debian/patches/03_gir_1.1.patch:
  - Compile with the latest Gobject introspection

Show diffs side-by-side

added added

removed removed

Lines of Context:
avahi-ui/Makefile.am
1
 
# $Id$
2
 
#
3
1
# This file is part of avahi.
4
 
# 
 
2
#
5
3
# avahi is free software; you can redistribute it and/or modify it
6
4
# under the terms of the GNU Lesser General Public License as
7
5
# published by the Free Software Foundation; either version 2 of the
23
21
AM_CFLAGS+='-DDEBUG_TRAP=__asm__("int $$3")'
24
22
 
25
23
desktopdir = $(datadir)/applications
26
 
desktop_DATA = 
 
24
desktop_DATA =
27
25
desktop_DATA_in = $(desktop_DATA_in_in:.in.in=.in)
28
26
desktop_DATA_in_in = bssh.desktop.in.in bvnc.desktop.in.in
29
27
 
30
28
EXTRA_DIST = $(desktop_DATA_in_in)
31
29
 
32
 
if HAVE_GTK
 
30
if HAVE_GTK2OR3
33
31
AM_CFLAGS += -DGNOMELOCALEDIR=\"$(datadir)/locale\"
34
32
if HAVE_DBUS
35
33
if HAVE_GLIB
39
37
avahiinclude_HEADERS = \
40
38
        avahi-ui.h
41
39
 
42
 
lib_LTLIBRARIES = \
43
 
        libavahi-ui.la 
 
40
lib_LTLIBRARIES =
 
41
 
 
42
if HAVE_GTK
 
43
lib_LTLIBRARIES += \
 
44
        libavahi-ui.la
 
45
endif
 
46
 
 
47
if HAVE_GTK3
 
48
lib_LTLIBRARIES += \
 
49
        libavahi-ui-gtk3.la
 
50
endif
44
51
 
45
52
libavahi_ui_la_SOURCES = \
46
53
        avahi-ui.h avahi-ui.c
48
55
libavahi_ui_la_LIBADD = $(AM_LDADD) ../avahi-common/libavahi-common.la ../avahi-client/libavahi-client.la ../avahi-glib/libavahi-glib.la $(GTK20_LIBS)
49
56
libavahi_ui_la_LDFLAGS = $(AM_LDFLAGS)  -version-info $(LIBAVAHI_UI_VERSION_INFO)
50
57
 
 
58
libavahi_ui_gtk3_la_SOURCES = $(libavahi_ui_la_SOURCES)
 
59
libavahi_ui_gtk3_la_CFLAGS = $(AM_CFLAGS) $(GTK30_CFLAGS)
 
60
libavahi_ui_gtk3_la_LIBADD = $(AM_LDADD) ../avahi-common/libavahi-common.la ../avahi-client/libavahi-client.la ../avahi-glib/libavahi-glib.la $(GTK30_LIBS)
 
61
libavahi_ui_gtk3_la_LDFLAGS = $(AM_LDFLAGS)  -version-info $(LIBAVAHI_UI_VERSION_INFO)
 
62
 
51
63
if HAVE_GDBM
52
64
libavahi_ui_la_SOURCES += ../avahi-utils/stdb.h ../avahi-utils/stdb.c
53
65
libavahi_ui_la_CFLAGS += -DDATABASE_FILE=\"$(pkglibdir)/service-types.db\"
54
66
libavahi_ui_la_LIBADD += -lgdbm
 
67
 
 
68
libavahi_ui_gtk3_la_CFLAGS += -DDATABASE_FILE=\"$(pkglibdir)/service-types.db\"
 
69
libavahi_ui_gtk3_la_LIBADD += -lgdbm
55
70
endif
56
71
 
57
72
if HAVE_DBM
58
73
libavahi_ui_la_SOURCES += ../avahi-utils/stdb.h ../avahi-utils/stdb.c
59
74
libavahi_ui_la_CFLAGS += -DDATABASE_FILE=\"$(pkglibdir)/service-types.db\"
 
75
 
 
76
libavahi_ui_gtk3_la_CFLAGS += -DDATABASE_FILE=\"$(pkglibdir)/service-types.db\"
60
77
endif
61
78
 
62
79
bin_PROGRAMS = bssh
64
81
@INTLTOOL_DESKTOP_RULE@
65
82
 
66
83
bssh_SOURCES = bssh.c
 
84
 
 
85
if HAVE_GTK3
 
86
bssh_CFLAGS = $(AM_CFLAGS) $(GTK30_CFLAGS)
 
87
bssh_LDADD = $(AM_LDADD) $(GTK30_LIBS) ../avahi-client/libavahi-client.la ../avahi-common/libavahi-common.la libavahi-ui-gtk3.la
 
88
else
67
89
bssh_CFLAGS = $(AM_CFLAGS) $(GTK20_CFLAGS)
68
90
bssh_LDADD = $(AM_LDADD) $(GTK20_LIBS) ../avahi-client/libavahi-client.la ../avahi-common/libavahi-common.la libavahi-ui.la
 
91
endif
69
92
 
70
93
install-exec-local:
71
94
        cd $(DESTDIR)/$(bindir) && \
74
97
                $(LN_S) bssh bshell
75
98
 
76
99
bssh.desktop.in: bssh.desktop.in.in
77
 
        sed -e 's,@bindir\@,$(bindir),g' $< > $@
 
100
        $(AM_V_GEN)sed -e 's,@bindir\@,$(bindir),g' $< > $@
78
101
 
79
102
bvnc.desktop.in: bvnc.desktop.in.in
80
 
        sed -e 's,@bindir\@,$(bindir),g' $< > $@
 
103
        $(AM_V_GEN)sed -e 's,@bindir\@,$(bindir),g' $< > $@
81
104
 
82
105
endif # HAVE_GLIB
83
106
endif