← Back to branch summary

~ubuntu-branches/ubuntu/saucy/openbox/saucy-proposed

« back to all changes in this revision

Viewing changes to Makefile.am

  • Committer: Package Import Robot
  • Author(s): Julien Lavergne
  • Date: 2013-08-29 00:47:27 UTC
  • mfrom: (1.1.12)
  • Revision ID: package-import@ubuntu.com-20130829004727-isarfdp00eoloeeq
Tags: 3.5.2-0ubuntu1
* New upstream release. 
* debian/control & debian/*.install:
 - Update SONAME number.
* debian/*.symbols:
 - Update.
* debian/patches:
 - 04_xsession.desktop_translation.patch: Refresh.
 - 01_rc.xml.patch: Refresh.
 - 05_simplify_gnome_session.patch: Refresh.
 - 07_fix_xml_load_file.patch: Refresh.
 - 90_fix_link_obt.patch: Remove, merged upstream.
 - 675991_fix_crash_from_gtk3_apps.patch: Remove, merged upstream.
 - 666676_wrong_undecorated_window_placement.patch: Remove, merged upstream.
 - clever-rectangle-picking.patch: Remove, merged upstream.
 - use-nearest-monitor.patch: Remove, merged upstream.
 - 704724_fix_refers-to-autostart.sh.patch: Remove, merged upstream.
 - 91_fix_loose_focus.patch: Remove, merged upstream.
 - openbox-3.5.0-title-matching.patch: Refresh.
 - openbox-3.5.0-which-2.20.patch: Refresh.
 - 658081_fix_kde_menu.patch: Remove, merged upstream.
 - add_automake1.11_support.patch: Remove, merged upstream.

Show diffs side-by-side

added added

removed removed

Lines of Context:
Makefile.am
6
6
configdir       = $(sysconfdir)/xdg
7
7
rcdir           = $(configdir)/openbox
8
8
xsessionsdir    = $(datadir)/xsessions
 
9
gnomesessiondir = $(datadir)/gnome-session/sessions
9
10
gnomewmfilesdir = $(datadir)/gnome/wm-properties
10
11
pkgconfigdir    = $(libdir)/pkgconfig
11
12
obtpubincludedir= $(includedir)/openbox/@OBT_VERSION@/obt
74
75
        $(XML_CFLAGS) \
75
76
        $(PANGO_CFLAGS) \
76
77
        $(IMLIB2_CFLAGS) \
 
78
        $(LIBRSVG_CFLAGS) \
77
79
        -DG_LOG_DOMAIN=\"ObRender\" \
78
80
        -DDEFAULT_THEME=\"$(theme)\"
79
81
obrender_libobrender_la_LDFLAGS = \
84
86
        $(PANGO_LIBS) \
85
87
        $(GLIB_LIBS) \
86
88
        $(IMLIB2_LIBS) \
 
89
        $(LIBRSVG_LIBS) \
87
90
        $(XML_LIBS)
88
91
obrender_libobrender_la_SOURCES = \
89
92
        gettext.h \
 
93
        obrender/button.c \
90
94
        obrender/color.h \
91
95
        obrender/color.c \
92
96
        obrender/font.h \
111
115
## obt ##
112
116
 
113
117
obt_libobt_la_CPPFLAGS = \
 
118
        $(X_CFLAGS) \
114
119
        $(XINERAMA_CFLAGS) \
115
120
        $(XKB_CFLAGS) \
116
121
        $(XRANDR_CFLAGS) \
125
130
obt_libobt_la_LDFLAGS = \
126
131
        -version-info $(OBT_CURRENT):$(OBT_REVISION):$(OBT_AGE)
127
132
obt_libobt_la_LIBADD = \
 
133
        $(X_LIBS) \
128
134
        $(XINERAMA_LIBS) \
129
135
        $(XKB_LIBS) \
130
136
        $(XRANDR_LIBS) \
281
287
        openbox/ping.h \
282
288
        openbox/place.c \
283
289
        openbox/place.h \
 
290
        openbox/place_overlap.c \
 
291
        openbox/place_overlap.h \
284
292
        openbox/prompt.c \
285
293
        openbox/prompt.h \
286
294
        openbox/popup.c \
512
520
        data/xsession/openbox-gnome.desktop \
513
521
        data/xsession/openbox-kde.desktop
514
522
 
 
523
dist_gnomesession_DATA = \
 
524
        data/gnome-session/openbox-gnome.session \
 
525
        data/gnome-session/openbox-gnome-fallback.session
 
526
 
515
527
dist_noinst_DATA = \
516
528
        data/rc.xsd \
517
529
        data/menu.xsd \