Permalink
Browse files

Replace INCLUDES with AM_CPPFLAGS

  • Loading branch information...
1 parent ddef38f commit cd839c69c5056fb5dba381c75210a431cf86de87 @tzhuan tzhuan committed Sep 24, 2014
View
@@ -1,26 +1,14 @@
#! /bin/sh
-# bootstrap -- Use this script to create generated files from the CVS dist
-# Copyright (C) 2000 Gary V. Vaughan
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-
-## @start 1
-#! /bin/sh
set -x
-autoreconf --force --install
-intltoolize --force
-autoreconf
-## @end 1
+
+INTLTOOLIZE=`which intltoolize`
+AUTORECONF=`which autoreconf`
+
+if test -z $INTLTOOLIZE -o -z $AUTORECONF; then
+ echo "Error: no intltoolize or autoreconf found, please install them" >&2
+ exit 1
+fi
+
+$INTLTOOLIZE --copy --force --automake
+$AUTORECONF --force --install --verbose
View
@@ -78,7 +78,7 @@ AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE,"$GETTEXT_PACKAGE", [The gettext domain])
###########################################################
# Init automake stuff
-AM_INIT_AUTOMAKE
+AM_INIT_AUTOMAKE([subdir-objects])
AM_CONFIG_HEADER([config.h])
# Init libtool
@@ -1,9 +1,9 @@
MAINTAINERCLEANFILES = Makefile.in
EXTRA_DIST = ../im-scim.version-script
-INCLUDES = -I$(top_builddir) \
+AM_CPPFLAGS = -I$(top_builddir) \
-I$(top_builddir)/src \
- -I$(top_srcdir) \
+ -I$(top_srcdir) \
-I$(top_srcdir)/src \
-I$(top_srcdir)/intl \
-I$(top_srcdir)/data \
@@ -1,9 +1,9 @@
MAINTAINERCLEANFILES = Makefile.in
EXTRA_DIST = ../im-scim.version-script
-INCLUDES = -I$(top_builddir) \
+AM_CPPFLAGS = -I$(top_builddir) \
-I$(top_builddir)/src \
- -I$(top_srcdir) \
+ -I$(top_srcdir) \
-I$(top_srcdir)/src \
-I$(top_srcdir)/intl \
-I$(top_srcdir)/data \
@@ -17,7 +17,7 @@
if SCIM_BUILD_IM_AGENT
-INCLUDES = -I$(top_srcdir) \
+AM_CPPFLAGS = -I$(top_srcdir) \
-I$(top_srcdir)/src \
-I$(top_srcdir)/extras/immodules/common \
-DSCIM_LOCALEDIR=\"@SCIM_LOCALEDIR@\" \
@@ -17,7 +17,7 @@
if SCIM_BUILD_CLUTTER_IMMODULE
-INCLUDES = -I$(top_builddir) \
+AM_CPPFLAGS = -I$(top_builddir) \
-I$(top_srcdir) \
-I$(top_srcdir)/extras/immodules/common \
-I$(top_srcdir)/extras/immodules/client-common
@@ -17,7 +17,7 @@
if SCIM_BUILD_IMMODULE
-INCLUDES = -I$(top_builddir) \
+AM_CPPFLAGS = -I$(top_builddir) \
-I$(top_builddir)/src \
-I$(top_srcdir) \
-I$(top_srcdir)/src \
@@ -17,7 +17,7 @@
if SCIM_BUILD_GTK2_IMMODULE
-INCLUDES = -I$(top_builddir) \
+AM_CPPFLAGS = -I$(top_builddir) \
-I$(top_srcdir) \
-I$(top_srcdir)/extras/immodules/common \
-I$(top_srcdir)/extras/immodules/client-common
@@ -17,8 +17,8 @@
if SCIM_BUILD_GTK3_IMMODULE
-INCLUDES = -I$(top_builddir) \
- -I$(top_srcdir) \
+AM_CPPFLAGS = -I$(top_builddir) \
+ -I$(top_srcdir) \
-I$(top_srcdir)/extras/immodules/common \
-I$(top_srcdir)/extras/immodules/client-common
@@ -17,8 +17,8 @@
if SCIM_BUILD_QT3_IMMODULE
-INCLUDES = -I$(top_builddir) \
- -I$(top_srcdir) \
+AM_CPPFLAGS = -I$(top_builddir) \
+ -I$(top_srcdir) \
-I$(top_srcdir)/extras/immodules/common \
-I$(top_srcdir)/extras/immodules/client-common
@@ -17,8 +17,8 @@
if SCIM_BUILD_QT4_IMMODULE
-INCLUDES = -I$(top_builddir) \
- -I$(top_srcdir) \
+AM_CPPFLAGS = -I$(top_builddir) \
+ -I$(top_srcdir) \
-I$(top_srcdir)/extras/immodules/common \
-I$(top_srcdir)/extras/immodules/client-common
@@ -17,7 +17,7 @@
MAINTAINERCLEANFILES = Makefile.in
-INCLUDES = -I$(top_builddir) \
+AM_CPPFLAGS = -I$(top_builddir) \
-I$(top_builddir)/src \
-I$(top_srcdir) \
-I$(top_srcdir)/src \
@@ -1,8 +1,8 @@
MAINTAINERCLEANFILES = Makefile.in
-INCLUDES = -I$(top_builddir) \
+AM_CPPFLAGS = -I$(top_builddir) \
-I$(top_builddir)/src \
- -I$(top_srcdir) \
+ -I$(top_srcdir) \
-I$(top_srcdir)/src \
-I$(top_srcdir)/intl \
-I$(top_srcdir)/data \
@@ -19,9 +19,9 @@
MAINTAINERCLEANFILES = Makefile.in
CLEANFILES = *.bak scim-setup.desktop scim-setup
-INCLUDES = -I$(top_builddir) \
+AM_CPPFLAGS = -I$(top_builddir) \
-I$(top_builddir)/src \
- -I$(top_srcdir) \
+ -I$(top_srcdir) \
-I$(top_srcdir)/src \
-I$(top_srcdir)/intl \
-DSCIM_DATADIR=\"@SCIM_DATADIR@\" \
@@ -19,9 +19,9 @@ MAINTAINERCLEANFILES = Makefile.in
CLEANFILES = *.bak
EXTRA_DIST = config.version-script
-INCLUDES = -I$(top_builddir) \
+AM_CPPFLAGS = -I$(top_builddir) \
-I$(top_builddir)/src \
- -I$(top_srcdir) \
+ -I$(top_srcdir) \
-I$(top_srcdir)/src \
-I$(top_srcdir)/intl \
-DSCIM_DATADIR=\"@SCIM_DATADIR@\" \
@@ -18,9 +18,9 @@
MAINTAINERCLEANFILES = Makefile.in
CLEANFILES = *.bak
-INCLUDES = -I$(top_builddir) \
+AM_CPPFLAGS = -I$(top_builddir) \
-I$(top_builddir)/src \
- -I$(top_srcdir) \
+ -I$(top_srcdir) \
-I$(top_srcdir)/src \
-I$(top_srcdir)/intl \
-I$(top_srcdir)/utils \
@@ -18,9 +18,9 @@
MAINTAINERCLEANFILES = Makefile.in
CLEANFILES = *.bak
-INCLUDES = -I$(top_builddir) \
+AM_CPPFLAGS = -I$(top_builddir) \
-I$(top_builddir)/src \
- -I$(top_srcdir) \
+ -I$(top_srcdir) \
-I$(top_srcdir)/src \
-I$(top_srcdir)/intl \
-I$(top_srcdir)/data \
@@ -19,9 +19,9 @@ MAINTAINERCLEANFILES = Makefile.in
CLEANFILES = *.bak
EXTRA_DIST = imengine.version-script
-INCLUDES = -I$(top_builddir) \
+AM_CPPFLAGS = -I$(top_builddir) \
-I$(top_builddir)/src \
- -I$(top_srcdir) \
+ -I$(top_srcdir) \
-I$(top_srcdir)/src \
-I$(top_srcdir)/intl \
-I$(top_srcdir)/utils \
@@ -18,9 +18,9 @@
MAINTAINERCLEANFILES = Makefile.in
CLEANFILES = *.bak
-INCLUDES = -I$(top_builddir) \
+AM_CPPFLAGS = -I$(top_builddir) \
-I$(top_builddir)/src \
- -I$(top_srcdir) \
+ -I$(top_srcdir) \
-I$(top_srcdir)/src \
-I$(top_srcdir)/intl \
-I$(top_srcdir)/data \
View
@@ -20,9 +20,9 @@ CLEANFILES = libscim.la *.bak
DISTCLEANFILES = scim_types.h
EXTRA_DIST = libscim.version-script
-INCLUDES = -I$(top_builddir) \
+AM_CPPFLAGS = -I$(top_builddir) \
-I$(top_builddir)/src \
- -I$(top_srcdir) \
+ -I$(top_srcdir) \
-I$(top_srcdir)/src \
-I$(top_srcdir)/intl \
-DSCIM_DATADIR=\"@SCIM_DATADIR@\" \
View
@@ -1,9 +1,9 @@
MAINTAINERCLEANFILES = Makefile.in
-INCLUDES = -I$(top_builddir) \
+AM_CPPFLAGS = -I$(top_builddir) \
-I$(top_builddir)/src \
- -I$(top_srcdir) \
- -I$(top_srcdir)/intl \
+ -I$(top_srcdir) \
+ -I$(top_srcdir)/intl \
-I$(top_srcdir)/src \
-DSCIM_DATADIR=\"@SCIM_DATADIR@\" \
-DSCIM_LOCALEDIR=\"@SCIM_LOCALEDIR@\" \
View
@@ -17,9 +17,9 @@
MAINTAINERCLEANFILES = Makefile.in
-INCLUDES = -I$(top_builddir) \
+AM_CPPFLAGS = -I$(top_builddir) \
-I$(top_builddir)/src \
- -I$(top_srcdir) \
+ -I$(top_srcdir) \
-I$(top_srcdir)/src \
-I$(top_srcdir)/intl \
-I$(top_srcdir)/data \

0 comments on commit cd839c6

Please sign in to comment.