← Back to branch summary

~indicator-applet-developers/indicator-applet/trunk.14.04

« back to all changes in this revision

Viewing changes to src/Makefile.am

  • Committer: Bileto Bot
  • Date: 2016-11-22 11:02:46 UTC
  • mfrom: (433.1.3 indicator-applet)
  • Revision ID: ci-train-bot@canonical.com-20161122110246-uh1ey9j5nzyd4c1h
* Convert from out-of-process applet to in-process applet:
  - Do not call methods that change the global state, such as
    g_log_set_default_handler().
  - Refactor src/Makefile.am, reuse some flags for different builds.
  - Drop the D-Bus services files, no longer needed.
* Do not call panel_applet_set_background_widget(), this call is not
  needed with libpanel-applet ≥ 3.16.
* Update the install files according to in-process switch.
* Remove the apport hook, not useful without log files.

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/Makefile.am
1
 
 
2
 
libexec_PROGRAMS = \
3
 
        indicator-applet \
4
 
        indicator-applet-appmenu \
5
 
        indicator-applet-session \
6
 
        indicator-applet-complete
7
 
 
8
 
indicator_applet_CFLAGS = \
 
1
indicator_applet_libdir = ${pkglibdir}
 
2
indicator_applet_lib_LTLIBRARIES = \
 
3
        libindicator-applet.la \
 
4
        libindicator-applet-appmenu.la \
 
5
        libindicator-applet-session.la \
 
6
        libindicator-applet-complete.la
 
7
 
 
8
APPLET_SOURCES = \
 
9
        applet-main.c \
 
10
        eggaccelerators.c \
 
11
        eggaccelerators.h \
 
12
        tomboykeybinder.c \
 
13
        tomboykeybinder.h
 
14
 
 
15
APPLET_CPPFLAGS = \
 
16
        -DDATADIR=\""$(datadir)"\" \
 
17
        -DINDICATOR_DIR=\""$(INDICATORDIR)"\" \
 
18
        -DINDICATOR_ICONS_DIR=\""$(INDICATORICONSDIR)"\" \
 
19
        -DGDK_DISABLE_DEPRECATED \
 
20
        -I$(srcdir)/..
 
21
 
 
22
AM_CFLAGS = $(APPLET_CFLAGS)
 
23
AM_LDFLAGS = -module -avoid-version
 
24
 
 
25
libindicator_applet_la_SOURCES = $(APPLET_SOURCES)
 
26
libindicator_applet_la_CPPFLAGS = $(APPLET_CPPFLAGS) \
9
27
        -DG_LOG_DOMAIN=\""Indicator-Applet"\" \
10
 
        -DDATADIR=\""$(datadir)"\" \
11
 
        -DINDICATOR_DIR=\""$(INDICATORDIR)"\" \
12
 
        -DINDICATOR_ICONS_DIR=\""$(INDICATORICONSDIR)"\" \
13
 
        -DINDICATOR_APPLET \
14
 
        -DGDK_DISABLE_DEPRECATED \
15
 
        -I$(srcdir)/.. \
16
 
        $(APPLET_CFLAGS)
17
 
 
18
 
indicator_applet_SOURCES = \
19
 
        applet-main.c \
20
 
        eggaccelerators.c \
21
 
        eggaccelerators.h \
22
 
        tomboykeybinder.c \
23
 
        tomboykeybinder.h
24
 
 
25
 
indicator_applet_LDADD = \
26
 
        $(APPLET_LIBS)
27
 
 
28
 
indicator_applet_appmenu_CFLAGS = \
 
28
        -DINDICATOR_APPLET
 
29
libindicator_applet_la_LIBADD = $(APPLET_LIBS)
 
30
 
 
31
libindicator_applet_appmenu_la_SOURCES = $(APPLET_SOURCES)
 
32
libindicator_applet_appmenu_la_CPPFLAGS = $(APPLET_CPPFLAGS) \
29
33
        -DG_LOG_DOMAIN=\""Indicator-Applet-Appmenu"\" \
30
 
        -DDATADIR=\""$(datadir)"\" \
31
 
        -DINDICATOR_DIR=\""$(INDICATORDIR)"\" \
32
 
        -DINDICATOR_ICONS_DIR=\""$(INDICATORICONSDIR)"\" \
33
 
        -DINDICATOR_APPLET_APPMENU \
34
 
        -DGDK_DISABLE_DEPRECATED \
35
 
        -I$(srcdir)/.. \
36
 
        $(APPLET_CFLAGS)
37
 
 
38
 
indicator_applet_appmenu_SOURCES = \
39
 
        applet-main.c \
40
 
        eggaccelerators.c \
41
 
        eggaccelerators.h \
42
 
        tomboykeybinder.c \
43
 
        tomboykeybinder.h
44
 
 
45
 
indicator_applet_appmenu_LDADD = \
46
 
        $(APPLET_LIBS)
47
 
 
48
 
indicator_applet_session_CFLAGS = \
 
34
        -DINDICATOR_APPLET_APPMENU
 
35
libindicator_applet_appmenu_la_LIBADD = $(APPLET_LIBS)
 
36
 
 
37
libindicator_applet_session_la_SOURCES = $(APPLET_SOURCES)
 
38
libindicator_applet_session_la_CPPFLAGS = $(APPLET_CPPFLAGS) \
49
39
        -DG_LOG_DOMAIN=\""Indicator-Applet-Session"\" \
50
 
        -DDATADIR=\""$(datadir)"\" \
51
 
        -DINDICATOR_DIR=\""$(INDICATORDIR)"\" \
52
 
        -DINDICATOR_ICONS_DIR=\""$(INDICATORICONSDIR)"\" \
53
 
        -DINDICATOR_APPLET_SESSION \
54
 
        -DGDK_DISABLE_DEPRECATED \
55
 
        -I$(srcdir)/.. \
56
 
        $(APPLET_CFLAGS)
57
 
 
58
 
indicator_applet_session_SOURCES = \
59
 
        applet-main.c \
60
 
        eggaccelerators.c \
61
 
        eggaccelerators.h \
62
 
        tomboykeybinder.c \
63
 
        tomboykeybinder.h
64
 
 
65
 
indicator_applet_session_LDADD = \
66
 
        $(APPLET_LIBS)
67
 
 
68
 
indicator_applet_complete_CFLAGS = \
 
40
        -DINDICATOR_APPLET_SESSION
 
41
libindicator_applet_session_la_LIBADD = $(APPLET_LIBS)
 
42
 
 
43
libindicator_applet_complete_la_SOURCES = $(APPLET_SOURCES)
 
44
libindicator_applet_complete_la_CPPFLAGS = $(APPLET_CPPFLAGS) \
69
45
        -DG_LOG_DOMAIN=\""Indicator-Applet-Complete"\" \
70
 
        -DDATADIR=\""$(datadir)"\" \
71
 
        -DINDICATOR_DIR=\""$(INDICATORDIR)"\" \
72
 
        -DINDICATOR_ICONS_DIR=\""$(INDICATORICONSDIR)"\" \
73
 
        -DINDICATOR_APPLET_COMPLETE \
74
 
        -DGDK_DISABLE_DEPRECATED \
75
 
        -I$(srcdir)/.. \
76
 
        $(APPLET_CFLAGS)
77
 
 
78
 
indicator_applet_complete_SOURCES =     \
79
 
        applet-main.c \
80
 
        eggaccelerators.c \
81
 
        eggaccelerators.h \
82
 
        tomboykeybinder.c \
83
 
        tomboykeybinder.h
84
 
 
85
 
indicator_applet_complete_LDADD = \
86
 
        $(APPLET_LIBS)
 
46
        -DINDICATOR_APPLET_COMPLETE
 
47
libindicator_applet_complete_la_LIBADD = $(APPLET_LIBS)