| Patrick Williams | b48b7b4 | 2016-08-17 15:04:38 -0500 | [diff] [blame^] | 1 | From e710d8d4a3e3480416826c70d56ea3d2598a77e4 Mon Sep 17 00:00:00 2001 |
| 2 | From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com> |
| 3 | Date: Thu, 28 Mar 2013 23:41:03 +0100 |
| 4 | Subject: [PATCH] reduce build to exo-csource only |
| 5 | MIME-Version: 1.0 |
| 6 | Content-Type: text/plain; charset=UTF-8 |
| 7 | Content-Transfer-Encoding: 8bit |
| 8 | |
| 9 | exo-csource creates c-header files from glade resource output files. When |
| 10 | building xfce-packages from git instead of tarball this exo-csource-native is |
| 11 | required. |
| 12 | |
| 13 | Upstream-Status: Inappropriate [configuration] |
| 14 | |
| 15 | Signed-off-by: Andreas MΓΌller <schnitzeltony@googlemail.com> |
| 16 | --- |
| 17 | Makefile.am | 10 +--------- |
| 18 | configure.ac | 20 -------------------- |
| 19 | 2 files changed, 1 insertion(+), 29 deletions(-) |
| 20 | |
| 21 | diff --git a/Makefile.am b/Makefile.am |
| 22 | index ad7c6ce..3acd94a 100644 |
| 23 | --- a/Makefile.am |
| 24 | +++ b/Makefile.am |
| 25 | @@ -1,15 +1,7 @@ |
| 26 | ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS} |
| 27 | |
| 28 | SUBDIRS = \ |
| 29 | - exo \ |
| 30 | - exo-csource \ |
| 31 | - exo-desktop-item-edit \ |
| 32 | - exo-helper \ |
| 33 | - exo-open \ |
| 34 | - docs \ |
| 35 | - icons \ |
| 36 | - pixmaps \ |
| 37 | - po |
| 38 | + exo-csource |
| 39 | |
| 40 | distclean-local: |
| 41 | rm -rf *.cache *~ |
| 42 | diff --git a/configure.ac b/configure.ac |
| 43 | index bb9be05..23471d0 100644 |
| 44 | --- a/configure.ac |
| 45 | +++ b/configure.ac |
| 46 | @@ -116,15 +116,6 @@ AC_PROG_CC() |
| 47 | AM_PROG_CC_C_O() |
| 48 | AC_PROG_INSTALL() |
| 49 | IT_PROG_INTLTOOL([intltool_minimum_version], [no-xml]) |
| 50 | -AC_CHECK_PROGS([PERL], [perl5 perl]) |
| 51 | - |
| 52 | -dnl *************************************** |
| 53 | -dnl *** Check for required Perl modules *** |
| 54 | -dnl *************************************** |
| 55 | -AC_PROG_PERL_MODULES([URI::Escape URI::file URI::URL], [], |
| 56 | -[ |
| 57 | - AC_MSG_ERROR([Atleast one of the required Perl modules (URI::Escape, URI::file and URI::URL) was not found on your system]) |
| 58 | -]) |
| 59 | |
| 60 | dnl *************************************** |
| 61 | dnl *** Check for standard header files *** |
| 62 | @@ -171,17 +162,6 @@ dnl *********************************** |
| 63 | dnl *** Check for required packages *** |
| 64 | dnl *********************************** |
| 65 | XDT_CHECK_PACKAGE([GLIB], [glib-2.0], [2.30.0]) |
| 66 | -XDT_CHECK_PACKAGE([GIO], [gio-2.0], [2.30.0]) |
| 67 | -XDT_CHECK_PACKAGE([GTK], [gtk+-2.0], [2.24.0]) |
| 68 | -XDT_CHECK_PACKAGE([GTHREAD], [gthread-2.0], [2.30.0]) |
| 69 | -XDT_CHECK_PACKAGE([LIBXFCE4UTIL], [libxfce4util-1.0], [4.10.0]) |
| 70 | -XDT_CHECK_PACKAGE([LIBXFCE4UI], [libxfce4ui-1], [4.10.0]) |
| 71 | -XDT_CHECK_OPTIONAL_PACKAGE([GIO_UNIX], [gio-unix-2.0], [2.30.0], [gio-unix], [GIO-Unix features]) |
| 72 | - |
| 73 | -dnl ********************* |
| 74 | -dnl *** Check for X11 *** |
| 75 | -dnl ********************* |
| 76 | -XDT_CHECK_LIBX11_REQUIRE() |
| 77 | |
| 78 | dnl ************************* |
| 79 | dnl *** Check for gtk-doc *** |
| 80 | -- |
| 81 | 1.9.3 |
| 82 | |