Commit: 330476a0490b1f9035325a45d7354ea76d913d73 - xinput_calibrator (git)

A generic touchscreen calibration program for X.Org

Commit MetaInfo

• Revisión: 330476a0490b1f9035325a45d7354ea76d913d73 (tree)
• Tiempo: 2010-01-25 09:10:30
• Autor: Tias Guns <tias@ulys...>
• Commiter: Tias Guns

Log Message

more standard directory layout, enhanced autotools, gitignore

Cambiar Resumen

• add: .gitignore
• modified: Makefile.am
• delete: calibrator.cpp => src/calibrator.cpp
• delete: calibrator.hh => src/calibrator.hh
• modified: configure.ac
• delete: gui_gtkmm.cpp => src/gui/gui_gtkmm.cpp
• delete: gui_x11.cpp => src/gui/gui_x11.cpp
• delete: main_common.hpp => src/main_common.hpp
• delete: main_gtkmm.cpp => src/main_gtkmm.cpp
• delete: main_x11.cpp => src/main_x11.cpp
• add: src/.gitignore
• add: src/Makefile.am
• delete: {calibrators => src/calibrator}/calibratorEvdev.cpp
• delete: {calibrators => src/calibrator}/calibratorUsbtouchscreen.cpp
• delete: {calibrators => src/calibrator}/calibratorXorgPrint.cpp

Diferencia incremental

--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,18 @@
+*.m4
+autom4te.cache
+autoscan.log
+compile
+config.*
+configure
+configure.scan
+depcomp
+.deps/
+install-sh
+libtool
+Makefile
+Makefile.in
+missing
+mkinstalldirs
+
+*.o
+*.pc

--- a/Makefile.am
+++ b/Makefile.am
@@ -1,5 +1,6 @@
 #
 # Copyright (c) 2010 Petr Stetiar <[e-mail]>
+# Copyright (c) 2010 Tias Guns <[e-mail]>
 #
 # Permission is hereby granted, free of charge, to any person
 # obtaining a copy of this software and associated documentation
@@ -23,19 +24,7 @@
 # OTHER DEALINGS IN THE SOFTWARE.
 #
 
-AM_CXXFLAGS = -Wall -ansi -pedantic -W -Wmissing-declarations -Werror
-
-if BUILD_GTKMM
-bin_PROGRAMS = xinput_calibrator_x11 xinput_calibrator_gtkmm
-xinput_calibrator_gtkmm_SOURCES = main_gtkmm.cpp
-xinput_calibrator_gtkmm_CXXFLAGS = $(GTKMM_CFLAGS) $(AM_CXXFLAGS)
-xinput_calibrator_gtkmm_LDADD = $(GTKMM_LIBS)
-else
-bin_PROGRAMS = xinput_calibrator_x11
-endif
-
-xinput_calibrator_x11_LDADD = $(XORG_LIBS)
-xinput_calibrator_x11_CXXFLAGS = $(XORG_CFLAGS) $(AM_CXXFLAGS)
-xinput_calibrator_x11_SOURCES = main_x11.cpp
+AUTOMAKE_OPTIONS = foreign
+SUBDIRS = src
 
 EXTRA_DIST = autogen.sh

--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,6 @@
 #
 # Copyright (c) 2010 Petr Stetiar <[e-mail]>
+# Copyright (c) 2010 Tias Guns <[e-mail]>
 #
 # Permission is hereby granted, free of charge, to any person
 # obtaining a copy of this software and associated documentation
@@ -24,7 +25,7 @@
 #
 
 AC_PREREQ([2.57])
-AC_INIT(xinput_calibrator,[0.5.0], [http://github.com/tias/xinput_calibrator])
+AC_INIT(xinput_calibrator,[0.5.0], [http://github.com/tias/xinput_calibrator/issues],, [http://www.freedesktop.org/wiki/Software/xinput_calibrator])
 AM_INIT_AUTOMAKE([foreign dist-bzip2])
 AM_MAINTAINER_MODE
 
@@ -32,19 +33,39 @@ 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)
+AC_PATH_X
+AC_CHECK_HEADERS([stdlib.h string.h])
+AC_HEADER_STDBOOL
+AC_FUNC_STRTOD
+AC_CHECK_FUNCS([strdup])
+
+PKG_CHECK_MODULES(XINPUT, x11 xext [xi >= 1.2] [inputproto >= 1.5])
+AC_SUBST(XINPUT_CFLAGS)
+AC_SUBST(XINPUT_LIBS)
+
+
+AC_ARG_ENABLE([x11], AS_HELP_STRING([--disable-x11], [Disable X11 GUI]))
+AS_IF([test "x$enable_x11" != "xno"], [
+	PKG_CHECK_MODULES(XORG, [x11], enable_x11="yes", enable_x11="no")
+    AC_SUBST(XORG_CFLAGS)
+    AC_SUBST(XORG_LIBS)
 ])
+AM_CONDITIONAL([BUILD_X11], [test "x$enable_x11" = "xyes"])
 
+
+AC_ARG_ENABLE([gtkmm], AS_HELP_STRING([--disable-gtkmm], [Disable GTKMM GUI]))
+AS_IF([test "x$enable_gtkmm" != "xno"], [
+	PKG_CHECK_MODULES(GTKMM, [gtkmm-2.4], enable_gtkmm="yes",
+        [if test "x$enable_gtkmm" = "xyes"; then
+            AC_MSG_ERROR([GTKMM GUI requested, but gtkmm-2.4 not found])
+         fi])
+    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_SUBST(VERSION)
 
-AC_CONFIG_FILES(Makefile)
-AC_OUTPUT
+AC_OUTPUT([Makefile
+           src/Makefile])

--- /dev/null
+++ b/src/.gitignore
@@ -0,0 +1,2 @@
+xinput_calibrator_x11
+xinput_calibrator_gtkmm

--- /dev/null
+++ b/src/Makefile.am
@@ -0,0 +1,46 @@
+#
+# Copyright (c) 2010 Petr Stetiar <[e-mail]>
+# Copyright (c) 2010 Tias Guns <[e-mail]>
+#
+# 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_CXXFLAGS = -Wall -ansi -pedantic -W -Wmissing-declarations -Werror
+
+if BUILD_X11
+bin_PROGRAMS = xinput_calibrator_x11
+xinput_calibrator_x11_SOURCES = main_x11.cpp
+xinput_calibrator_x11_LDADD = $(XINPUT_LIBS) $(XORG_LIBS)
+xinput_calibrator_x11_CXXFLAGS = $(XINPUT_CFLAGS) $(XORG_CFLAGS) $(AM_CXXFLAGS)
+endif
+
+if BUILD_GTKMM
+if BUILD_X11
+bin_PROGRAMS += xinput_calibrator_gtkmm
+else
+bin_PROGRAMS = xinput_calibrator_gtkmm
+endif
+xinput_calibrator_gtkmm_SOURCES = main_gtkmm.cpp
+xinput_calibrator_gtkmm_LDADD = $(XINPUT_LIBS) $(GTKMM_LIBS)
+xinput_calibrator_gtkmm_CXXFLAGS = $(XINPUT_CFLAGS) $(GTKMM_CFLAGS) $(AM_CXXFLAGS)
+endif
+

--- a/main_common.hpp
+++ b/src/main_common.hpp
@@ -87,9 +87,9 @@ class WrongCalibratorException : public std::invalid_argument {
 
 // all need struct XYinfo, and some the consts too
 #include "calibrator.cpp"
-#include "calibrators/calibratorXorgPrint.cpp"
-#include "calibrators/calibratorEvdev.cpp"
-#include "calibrators/calibratorUsbtouchscreen.cpp"
+#include "calibrator/calibratorXorgPrint.cpp"
+#include "calibrator/calibratorEvdev.cpp"
+#include "calibrator/calibratorUsbtouchscreen.cpp"
 
 
 

--- a/main_gtkmm.cpp
+++ b/src/main_gtkmm.cpp
@@ -28,7 +28,7 @@
 #include <cairomm/context.h>
 
 #include "main_common.hpp"
-#include "gui_gtkmm.cpp"
+#include "gui/gui_gtkmm.cpp"
 
 int main(int argc, char** argv)
 {

--- a/main_x11.cpp
+++ b/src/main_x11.cpp
@@ -21,7 +21,7 @@
  */
 
 #include "main_common.hpp"
-#include "gui_x11.cpp"
+#include "gui/gui_x11.cpp"
 
 int main(int argc, char** argv)
 {