blob: 8c950299f7e644788e09f251396a958642597741 [file] [log] [blame]
Patrick Williamsb48b7b42016-08-17 15:04:38 -05001From e710d8d4a3e3480416826c70d56ea3d2598a77e4 Mon Sep 17 00:00:00 2001
2From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com>
Brad Bishopc342db32019-05-15 21:57:59 -04003Date: Sat, 4 May 2019 14:50:11 +0200
Patrick Williamsb48b7b42016-08-17 15:04:38 -05004Subject: [PATCH] reduce build to exo-csource only
5MIME-Version: 1.0
6Content-Type: text/plain; charset=UTF-8
7Content-Transfer-Encoding: 8bit
8
9exo-csource creates c-header files from glade resource output files. When
10building xfce-packages from git instead of tarball this exo-csource-native is
11required.
12
Brad Bishop316dfdd2018-06-25 12:45:53 -040013Upstream-Status: Inappropriate [embedded specific]
Patrick Williamsb48b7b42016-08-17 15:04:38 -050014
15Signed-off-by: Andreas MΓΌller <schnitzeltony@googlemail.com>
Brad Bishop316dfdd2018-06-25 12:45:53 -040016
Patrick Williamsb48b7b42016-08-17 15:04:38 -050017---
18 Makefile.am | 10 +---------
Brad Bishopc342db32019-05-15 21:57:59 -040019 configure.ac | 20 --------------------
20 2 files changed, 1 insertion(+), 29 deletions(-)
Patrick Williamsb48b7b42016-08-17 15:04:38 -050021
22diff --git a/Makefile.am b/Makefile.am
Brad Bishopc342db32019-05-15 21:57:59 -040023index 62ad18d..8934f1f 100644
Patrick Williamsb48b7b42016-08-17 15:04:38 -050024--- a/Makefile.am
25+++ b/Makefile.am
26@@ -1,15 +1,7 @@
27 ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS}
28
29 SUBDIRS = \
30- exo \
31- exo-csource \
32- exo-desktop-item-edit \
33- exo-helper \
34- exo-open \
35- docs \
36- icons \
37- pixmaps \
38- po
39+ exo-csource
40
41 distclean-local:
42 rm -rf *.cache *~
43diff --git a/configure.ac b/configure.ac
Brad Bishopc342db32019-05-15 21:57:59 -040044index 4e4eb5e..237184c 100644
Patrick Williamsb48b7b42016-08-17 15:04:38 -050045--- a/configure.ac
46+++ b/configure.ac
Brad Bishopc342db32019-05-15 21:57:59 -040047@@ -120,15 +120,6 @@ AC_PROG_CC()
Patrick Williamsb48b7b42016-08-17 15:04:38 -050048 AM_PROG_CC_C_O()
49 AC_PROG_INSTALL()
50 IT_PROG_INTLTOOL([intltool_minimum_version], [no-xml])
51-AC_CHECK_PROGS([PERL], [perl5 perl])
52-
53-dnl ***************************************
54-dnl *** Check for required Perl modules ***
55-dnl ***************************************
56-AC_PROG_PERL_MODULES([URI::Escape URI::file URI::URL], [],
57-[
58- AC_MSG_ERROR([Atleast one of the required Perl modules (URI::Escape, URI::file and URI::URL) was not found on your system])
59-])
60
61 dnl ***************************************
62 dnl *** Check for standard header files ***
Brad Bishopc342db32019-05-15 21:57:59 -040063@@ -175,12 +166,6 @@ dnl ***********************************
Patrick Williamsb48b7b42016-08-17 15:04:38 -050064 dnl *** Check for required packages ***
65 dnl ***********************************
Brad Bishopd7bf8c12018-02-25 22:55:05 -050066 XDT_CHECK_PACKAGE([GLIB], [glib-2.0], [2.42.0])
67-XDT_CHECK_PACKAGE([GIO], [gio-2.0], [2.42.0])
Brad Bishop316dfdd2018-06-25 12:45:53 -040068-XDT_CHECK_PACKAGE([GTK3], [gtk+-3.0], [3.22.0])
Brad Bishopd7bf8c12018-02-25 22:55:05 -050069-XDT_CHECK_PACKAGE([GTHREAD], [gthread-2.0], [2.42.0])
Brad Bishop316dfdd2018-06-25 12:45:53 -040070-XDT_CHECK_PACKAGE([LIBXFCE4UTIL], [libxfce4util-1.0], [4.12.0])
Brad Bishopd7bf8c12018-02-25 22:55:05 -050071-XDT_CHECK_PACKAGE([LIBXFCE4UI2], [libxfce4ui-2], [4.12.0])
72-XDT_CHECK_OPTIONAL_PACKAGE([GIO_UNIX], [gio-unix-2.0], [2.42.0], [gio-unix], [GIO-Unix features])
Brad Bishopc342db32019-05-15 21:57:59 -040073
74 dnl ***********************************************************
75 dnl *** Optional support for a GTK+2 version of the library ***
76@@ -190,11 +175,6 @@ XDT_CHECK_OPTIONAL_PACKAGE([GTK2],
77 [GTK+ 2 support])
78 AM_CONDITIONAL([ENABLE_GTK2_LIBRARY], [test "x$GTK2_FOUND" = "xyes"])
79
Patrick Williamsb48b7b42016-08-17 15:04:38 -050080-dnl *********************
81-dnl *** Check for X11 ***
82-dnl *********************
83-XDT_CHECK_LIBX11_REQUIRE()
Brad Bishopc342db32019-05-15 21:57:59 -040084-
Patrick Williamsb48b7b42016-08-17 15:04:38 -050085 dnl *************************
86 dnl *** Check for gtk-doc ***
Brad Bishopc342db32019-05-15 21:57:59 -040087 dnl *************************
Patrick Williamsb48b7b42016-08-17 15:04:38 -050088--
Brad Bishopc342db32019-05-15 21:57:59 -0400892.20.1
Patrick Williamsb48b7b42016-08-17 15:04:38 -050090