Management of X/Y swap and inversions

.gitignore

@@ -14,6 +14,6 @@ Makefile
 Makefile.in
 missing
 mkinstalldirs
-
+*~
 *.o
 *.pc

autogen.sh

@@ -9,4 +9,4 @@ cd $srcdir
 autoreconf -v --install || exit 1
 cd $ORIGDIR || exit $?
 
-$srcdir/configure --enable-maintainer-mode "$@"
+$srcdir/configure --enable-maintainer-mode $@

configure.ac

@@ -46,6 +46,7 @@ AC_SUBST(XINPUT_LIBS)
 PKG_CHECK_MODULES(XI_PROP, [xi >= 1.2] [inputproto >= 1.5],
 			AC_DEFINE(HAVE_XI_PROP, 1, [Xinput properties available]), foo="bar")
 
+AC_CONFIG_MACRO_DIR([m4])
 
 AC_ARG_WITH([gui], AS_HELP_STRING([--with-gui=default], [Use gtkmm GUI if available, x11 GUI otherwise (default)]),,[with_gui=default])
 AC_ARG_WITH([gui], AS_HELP_STRING([--with-gui=gtkmm], [Use gtkmm GUI]))

src/.gitignore

@@ -1,2 +1,3 @@
 xinput_calibrator_x11
 xinput_calibrator_gtkmm
+xinput_calibrator

src/Makefile.am

@@ -28,19 +28,21 @@ SUBDIRS = \
 	calibrator \
 	gui
 
-AM_CXXFLAGS = -Wall -ansi -pedantic -Wmissing-declarations
+AM_CXXFLAGS = -Wall -ansi -pedantic
 
 bin_PROGRAMS = xinput_calibrator
 
+COMMON_SRCS=calibrator.cpp calibrator/XorgPrint.cpp calibrator/Evdev.cpp calibrator/Usbtouchscreen.cpp main_common.cpp
+
 # only one of the BUILD_ flags should be set
 if BUILD_X11
-xinput_calibrator_SOURCES = main_x11.cpp
+xinput_calibrator_SOURCES = gui/x11.cpp main_x11.cpp $(COMMON_SRCS)
 xinput_calibrator_LDADD = $(XINPUT_LIBS) $(XRANDR_LIBS) $(X11_LIBS)
 xinput_calibrator_CXXFLAGS = $(XINPUT_CFLAGS) $(X11_CFLAGS) $(XRANDR_CFLAGS) $(AM_CXXFLAGS)
 endif
 
 if BUILD_GTKMM
-xinput_calibrator_SOURCES = main_gtkmm.cpp
+xinput_calibrator_SOURCES = gui/gtkmm.cpp main_gtkmm.cpp $(COMMON_SRCS)
 xinput_calibrator_LDADD = $(XINPUT_LIBS) $(GTKMM_LIBS)
 xinput_calibrator_CXXFLAGS = $(XINPUT_CFLAGS) $(GTKMM_CFLAGS) $(AM_CXXFLAGS)
 
@@ -52,4 +54,5 @@ endif
 EXTRA_DIST = \
 	calibrator.cpp \
 	calibrator.hh \
-	main_common.hpp
+	main_common.cpp
+