Move shared vmmouse files into a separate static lib so we can

share it with the vmmouse detection utility I'm about to add.

9 files changed, 35 insertions, 11 deletions

diff --git a/Makefile.am b/Makefile.am
index 7052905..de3a585 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -19,4 +19,4 @@
 #  CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 AUTOMAKE_OPTIONS = foreign
-SUBDIRS = src man
+SUBDIRS = shared src man
diff --git a/configure.ac b/configure.ac
index 897c371..a389f3a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -101,4 +101,4 @@ AC_HEADER_STDC
 XORG_MANPAGE_SECTIONS
 XORG_RELEASE_VERSION
 
-AC_OUTPUT([Makefile src/Makefile man/Makefile])
+AC_OUTPUT([Makefile shared/Makefile src/Makefile man/Makefile])
diff --git a/shared/Makefile.am b/shared/Makefile.am
new file mode 100644
index 0000000..feedffa
--- /dev/null
+++ b/shared/Makefile.am
@@ -0,0 +1,29 @@
+#  Copyright 2008 VMware, Inc.
+#
+#  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
+#  on the rights to use, copy, modify, merge, publish, distribute, sub
+#  license, 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 (including the next
+#  paragraph) 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 NON-INFRINGEMENT.  IN NO EVENT SHALL
+#  VMWARE, INC. 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.
+
+INCLUDES = -I$(srcdir)
+
+noinst_LTLIBRARIES = lib@DRIVER_NAME@.la
+lib@DRIVER_NAME@_la_SOURCES = @DRIVER_NAME@_defs.h \
+                              @DRIVER_NAME@_client.c @DRIVER_NAME@_client.h \
+                              @DRIVER_NAME@_proto.c @DRIVER_NAME@_proto.h
+
+
+                               
diff --git a/src/vmmouse_client.c b/shared/vmmouse_client.c
index f34c223..f34c223 100644
--- a/src/vmmouse_client.c
+++ b/shared/vmmouse_client.c
diff --git a/src/vmmouse_client.h b/shared/vmmouse_client.h
index b01bf08..b01bf08 100644
--- a/src/vmmouse_client.h
+++ b/shared/vmmouse_client.h
diff --git a/src/vmmouse_defs.h b/shared/vmmouse_defs.h
index 8dc769e..8dc769e 100644
--- a/src/vmmouse_defs.h
+++ b/shared/vmmouse_defs.h
diff --git a/src/vmmouse_proto.c b/shared/vmmouse_proto.c
index b50e071..b50e071 100644
--- a/src/vmmouse_proto.c
+++ b/shared/vmmouse_proto.c
diff --git a/src/vmmouse_proto.h b/shared/vmmouse_proto.h
index a2eb1e4..a2eb1e4 100644
--- a/src/vmmouse_proto.h
+++ b/shared/vmmouse_proto.h
diff --git a/src/Makefile.am b/src/Makefile.am
index 9451d8f..b8ad878 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -18,19 +18,14 @@
 #  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.
 
+SHARED_DIR = $(top_srcdir)/shared
 
-# this is obnoxious:
-# -module lets us name the module exactly how we want
-# -avoid-version prevents gratuitous .0.0.0 version numbers on the end
-# _ladir passes a dummy rpath to libtool so the thing will actually link
-# TODO: -nostdlib/-Bstatic/-lgcc platform magic, not installing the .a, etc.
 @DRIVER_NAME@_drv_la_LTLIBRARIES = @DRIVER_NAME@_drv.la
 @DRIVER_NAME@_drv_la_LDFLAGS = -module -avoid-version
+@DRIVER_NAME@_drv_la_LIBADD = $(SHARED_DIR)/lib@DRIVER_NAME@.la
 @DRIVER_NAME@_drv_ladir = @inputdir@
 
-INCLUDES = -I$(srcdir)
+INCLUDES = -I$(SHARED_DIR)
 
-@DRIVER_NAME@_drv_la_SOURCES = @DRIVER_NAME@.c @DRIVER_NAME@_defs.h \
-                               @DRIVER_NAME@_client.c @DRIVER_NAME@_client.h \
-                               @DRIVER_NAME@_proto.c @DRIVER_NAME@_proto.h
+@DRIVER_NAME@_drv_la_SOURCES = @DRIVER_NAME@.c