wok-next view openbox/stuff/patches/openbox-no-gnome-no-kde.patch @ rev 20616
xrdp: up 0.9.3.1; zopfli: fix build; gcc61: attempt to fix; add gcc6 (latest among 6.x.x).
gcc61 and gcc6 are broken now.
gcc61 and gcc6 are broken now.
author | Aleksej Bobylev <al.bobylev@gmail.com> |
---|---|
date | Sat Apr 21 05:15:11 2018 +0300 (2018-04-21) |
parents | |
children |
line source
1 --- a/Makefile.am
2 +++ b/Makefile.am
3 @@ -6,8 +6,6 @@
4 configdir = $(sysconfdir)/xdg
5 rcdir = $(configdir)/openbox
6 xsessionsdir = $(datadir)/xsessions
7 -gnomesessiondir = $(datadir)/gnome-session/sessions
8 -gnomewmfilesdir = $(datadir)/gnome/wm-properties
9 pkgconfigdir = $(libdir)/pkgconfig
10 obtpubincludedir= $(includedir)/openbox/@OBT_VERSION@/obt
11 rrpubincludedir = $(includedir)/openbox/@RR_VERSION@/obrender
12 @@ -32,17 +30,13 @@
14 bin_PROGRAMS = \
15 openbox/openbox \
16 - tools/gdm-control/gdm-control \
17 - tools/gnome-panel-control/gnome-panel-control \
18 tools/obxprop/obxprop
20 noinst_PROGRAMS = \
21 obt/obt_unittests
23 nodist_bin_SCRIPTS = \
24 - data/xsession/openbox-session \
25 - data/xsession/openbox-gnome-session \
26 - data/xsession/openbox-kde-session
27 + data/xsession/openbox-session
29 dist_rc_SCRIPTS = \
30 data/environment
31 @@ -328,15 +322,6 @@
32 obt/unittest_base.c \
33 obt/bsearch_unittest.c
35 -## gnome-panel-control ##
36 -
37 -tools_gnome_panel_control_gnome_panel_control_CPPFLAGS = \
38 - $(X_CFLAGS)
39 -tools_gnome_panel_control_gnome_panel_control_LDADD = \
40 - $(X_LIBS)
41 -tools_gnome_panel_control_gnome_panel_control_SOURCES = \
42 - tools/gnome-panel-control/gnome-panel-control.c
43 -
44 ## obxprop ##
46 tools_obxprop_obxprop_CPPFLAGS = \
47 @@ -486,9 +471,6 @@
49 ## data ##
51 -dist_apps_DATA = \
52 - data/openbox.desktop
53 -
54 dist_pixmap_DATA = \
55 data/openbox.png
57 @@ -531,18 +513,9 @@
58 @echo make: creating $@
59 @$(edit) $< >$@
61 -dist_gnomewmfiles_DATA = \
62 - data/gnome-wm-properties/openbox.desktop
63 -
64 nodist_xsessions_DATA = \
65 - data/xsession/openbox.desktop \
66 - data/xsession/openbox-gnome.desktop \
67 - data/xsession/openbox-kde.desktop
68 + data/xsession/openbox.desktop
70 -dist_gnomesession_DATA = \
71 - data/gnome-session/openbox-gnome.session \
72 - data/gnome-session/openbox-gnome-fallback.session
73 -
74 dist_noinst_DATA = \
75 data/rc.xsd \
76 data/menu.xsd \
77 @@ -599,8 +572,6 @@
78 nodist_man_MANS = \
79 doc/openbox.1 \
80 doc/openbox-session.1 \
81 - doc/openbox-gnome-session.1 \
82 - doc/openbox-kde-session.1 \
83 doc/obxprop.1
85 EXTRA_DIST = \