Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

switch to autotools based build system

This patch autotoolize xinput_calibrator for easier (cross)compiling.
  • Loading branch information...
commit 754d23d7b043b2d3a5b70f9a15c3054296b7892a 1 parent 6af268f
@ynezz ynezz authored
Showing with 102 additions and 11 deletions.
  1. +0 −11 Makefile
  2. +41 −0 Makefile.am
  3. +12 −0 autogen.sh
  4. +49 −0 configure.ac
View
11 Makefile
@@ -1,11 +0,0 @@
-all: x11 gtkmm
-
-x11: main_x11.cpp gui_x11.cpp
- g++ -Wall main_x11.cpp -lX11 -lXi -o xinput_calibrator.x11
- cp xinput_calibrator.x11 xinput_calibrator
-
-gtkmm: main_gtkmm.cpp gui_gtkmm.cpp
- g++ -Wall main_gtkmm.cpp `pkg-config --cflags --libs gtkmm-2.4` -o xinput_calibrator.gtkmm
-
-clean:
- rm -f xinput_calibrator xinput_calibrator.x11 xinput_calibrator.gtkmm
View
41 Makefile.am
@@ -0,0 +1,41 @@
+#
+# Copyright (c) 2010 Petr Stetiar <ynezz@true.cz>
+#
+# Permission is hereby granted, free of charge, to any person
+# obtaining a copy of this software and associated documentation
+# files (the "Software"), to deal in the Software without
+# restriction, including without limitation the rights to use,
+# copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the
+# Software is furnished to do so, subject to the following
+# conditions:
+#
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
+# OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+# HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+# WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+# OTHER DEALINGS IN THE SOFTWARE.
+#
+
+#AM_CFLAGS = -Wall -ansi -pedantic -W -Wmissing-prototypes -Wmissing-declarations -Werror -std=gnu99
+
+if BUILD_GTKMM
+bin_PROGRAMS = xinput_calibrator_x11 xinput_calibrator_gtkmm
+xinput_calibrator_gtkmm_SOURCES = main_gtkmm.cpp
+xinput_calibrator_gtkmm_CXXFLAGS = $(GTKMM_CFLAGS)
+xinput_calibrator_gtkmm_LDADD = $(GTKMM_LIBS)
+else
+bin_PROGRAMS = xinput_calibrator_x11
+endif
+
+xinput_calibrator_x11_LDADD = $(XORG_LIBS)
+xinput_calibrator_x11_CFLAGS = $(XORG_CFLAGS)
+xinput_calibrator_x11_SOURCES = main_x11.cpp
+
+EXTRA_DIST = autogen.sh
View
12 autogen.sh
@@ -0,0 +1,12 @@
+#! /bin/sh
+
+srcdir=`dirname $0`
+test -z "$srcdir" && srcdir=.
+
+ORIGDIR=`pwd`
+cd $srcdir
+
+autoreconf -v --install || exit 1
+cd $ORIGDIR || exit $?
+
+$srcdir/configure --enable-maintainer-mode "$@"
View
49 configure.ac
@@ -0,0 +1,49 @@
+#
+# Copyright (c) 2010 Petr Stetiar <ynezz@true.cz>
+#
+# Permission is hereby granted, free of charge, to any person
+# obtaining a copy of this software and associated documentation
+# files (the "Software"), to deal in the Software without
+# restriction, including without limitation the rights to use,
+# copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the
+# Software is furnished to do so, subject to the following
+# conditions:
+#
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
+# OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+# HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+# WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+# OTHER DEALINGS IN THE SOFTWARE.
+#
+
+AC_PREREQ([2.57])
+AC_INIT(xinput_calibrator,[0.5.0], [http://github.com/tias/xinput_calibrator])
+AM_INIT_AUTOMAKE([foreign dist-bzip2])
+AM_MAINTAINER_MODE
+
+AC_PROG_CC
+AC_PROG_CXX
+AC_PROG_INSTALL
+
+AC_ARG_ENABLE([gtkmm], AS_HELP_STRING([--enable-gtkmm], [Enable GTKMM GUI]))
+AS_IF([test "x$enable_gtkmm" = "xyes"], [
+ PKG_CHECK_MODULES(GTKMM, [gtkmm-2.4])
+ AC_SUBST(GTKMM_CFLAGS)
+ AC_SUBST(GTKMM_LIBS)
+])
+
+AM_CONDITIONAL([BUILD_GTKMM], [test "x$enable_gtkmm" = "xyes"])
+
+PKG_CHECK_MODULES(XORG, [x11 xi])
+AC_SUBST(XORG_CFLAGS)
+AC_SUBST(XORG_LIBS)
+
+AC_CONFIG_FILES(Makefile)
+AC_OUTPUT
Please sign in to comment.
Something went wrong with that request. Please try again.