← Back to branch summary

~cyphermox/ido/gtest-source

« back to all changes in this revision

Viewing changes to src/Makefile.am

  • Committer: Charles Kerr
  • Date: 2012-03-12 21:24:21 UTC
  • mfrom: (100.1.4 futz)
  • Revision ID: charles.kerr@canonical.com-20120312212421-uu6xyqcnrjnk7vow
Merge lp:~charlesk/ido/lp-906050 into lp:ido to resolve the following LP tickets:

Bug #524541: Volume (slider) item isn't highlighted when selected 
Bug #886335: Unable to use arrow keys to adjust the volume control in the sound menu.
Bug #906050: Playback controls don't highlight anything like other menu items

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/Makefile.am
28
28
        idotypebuiltins.c.template
29
29
 
30
30
 
31
 
if USE_GTK3
32
 
sources_h += idooffscreenproxy.h
33
 
else
34
 
EXTRA_DIST += idooffscreenproxy.h \
35
 
              idooffscreenproxy.c
36
 
endif
37
 
 
38
31
idotypebuiltins.h: stamp-idotypebuiltins.h
39
32
 
40
33
stamp-idotypebuiltins.h: $(sources_h)
73
66
        idoscalemenuitem.c              \
74
67
        idotimeline.c                   
75
68
 
76
 
if USE_GTK3
77
 
libido_0_1_la_SOURCES += idooffscreenproxy.c
78
 
endif
79
 
 
80
69
libido3_0_1_la_SOURCES = $(libido_0_1_la_SOURCES)
81
70
 
82
71
libidoincludedir=$(includedir)/libido$(VER)-0.1/libido
90
79
        idotimeline.h                   \
91
80
        libido.h
92
81
 
93
 
if USE_GTK3
94
 
libidoinclude_HEADERS += idooffscreenproxy.h
95
 
endif
96
 
 
97
82
libido_0_1_la_LIBADD = $(GTK_LIBS)
98
83
libido_0_1_la_LDFLAGS = $(GTK_LT_LDFLAGS)
99
84
libido3_0_1_la_LIBADD = $(libido_0_1_la_LIBADD)