← Back to branch summary

~ubuntu-branches/ubuntu/vivid/indicator-application/vivid-proposed

« back to all changes in this revision

Viewing changes to src/Makefile.am

  • Committer: Bazaar Package Importer
  • Author(s): Ken VanDine, Ted Gould, Ken VanDine
  • Date: 2011-06-22 13:07:06 UTC
  • mfrom: (1.1.34 upstream)
  • Revision ID: james.westby@ubuntu.com-20110622130706-0yungcdx6prnhj5v
Tags: 0.3.90-0ubuntu1
[ Ted Gould ]
* New upstream release.
  * GTK3 Port

[ Ken VanDine ]
* debian/control
  - Bumped standards version to 3.9.2
  - Add new binary for indicator-application-gtk2 
  - Make indicator-application recommend indicator-application-gtk2 (until 
    unity can load gtk3 indicators)
  - indicator-application-gtk2 replaces indicator-application << 0.2.90
  - Added build depends for libdbusmenu-gtk3-dev, libindicator3-dev 
    and libappindicator3-dev
* debian/rules
  - build for both gtk2 and gtk3

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/Makefile.am
9
9
BUILT_SOURCES =
10
10
EXTRA_DIST = 
11
11
 
12
 
include $(top_srcdir)/Makefile.am.enum
13
12
include $(top_srcdir)/Makefile.am.marshal
14
13
 
15
14
##################################
29
28
        -Wl,--as-needed \
30
29
        -Werror \
31
30
        -DG_LOG_DOMAIN=\"Indicator-Application\"
32
 
libapplication_la_LIBADD = $(INDICATOR_LIBS)
 
31
libapplication_la_LIBADD = $(INDICATOR_LIBS) 
33
32
libapplication_la_LDFLAGS = -module -avoid-version
34
33
 
35
34
##################################
51
50
        application-service-watcher.h \
52
51
        application-service-watcher.c \
53
52
        gen-application-service.xml.c \
54
 
        app-indicator-enum-types.c \
55
53
        dbus-shared.h \
56
54
        generate-id.h \
57
55
        generate-id.c
58
56
 
59
57
indicator_application_service_CFLAGS = \
60
58
        $(INDICATOR_CFLAGS) \
61
 
        -I$(APP_INDICATOR_INCLUDE) \
 
59
        $(APPINDICATOR_CFLAGS) \
62
60
        -DDATADIR="\"$(pkgdatadir)\"" \
63
61
        -Wall -Werror \
64
62
        -DG_LOG_DOMAIN=\"indicator-application-service\"
65
63
 
66
64
indicator_application_service_LDADD = \
67
 
        $(INDICATOR_LIBS)
 
65
        $(INDICATOR_LIBS) \
 
66
        $(APPINDICATOR_LIBS)
68
67
 
69
68
glib_marshal_list = application-service-marshal.list
70
69
glib_marshal_prefix = _application_service_marshal
71
70
 
72
 
glib_enum_h = app-indicator-enum-types.h
73
 
glib_enum_c = app-indicator-enum-types.c
74
 
glib_enum_headers = $(wildcard $(APP_INDICATOR_INCLUDE)/libappindicator/*.h)
75
 
 
76
 
DISTCLEANFILES += app-indicator-enum-types.c
77
 
 
78
71
##################################
79
72
# DBus Specs
80
73
##################################