Engang til for prins Knud

3 files changed, 68 insertions, 3 deletions

diff --git a/configure.ac b/configure.ac
index 520a8c4..2fa524f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -40,9 +40,9 @@ AC_PROG_CC
 
 AH_TOP([#include "xorg-server.h"])
 
-AC_ARG_WITH(module-dir, [  --with-xorg-module-dir=DIR ],
-                        [ moduledir="$withval" ],
-                        [ moduledir="$libdir/xorg/modules" ])
+AC_ARG_WITH(xorg-module-dir, [  --with-xorg-module-dir=DIR ],
+                             [ moduledir="$withval" ],
+                             [ moduledir="$libdir/xorg/modules" ])
 AC_SUBST(moduledir)
 
 # Checks for pkg-config packages
diff --git a/man/Makefile.am b/man/Makefile.am
new file mode 100644
index 0000000..87d272a
--- /dev/null
+++ b/man/Makefile.am
@@ -0,0 +1,22 @@
+#  Copyright 2005 Adam Jackson.
+#
+#  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
+#  ADAM JACKSON 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.
+
+dist_man_MANS = \
+         apm.4
diff --git a/src/Makefile.am b/src/Makefile.am
new file mode 100644
index 0000000..eaa0751
--- /dev/null
+++ b/src/Makefile.am
@@ -0,0 +1,43 @@
+#  Copyright 2005 Adam Jackson.
+#
+#  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
+#  ADAM JACKSON 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.
+
+
+# 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.
+apm_drv_la_LTLIBRARIES = apm_drv.la
+apm_drv_la_LDFLAGS = -module -avoid-version
+apm_drv_ladir = @moduledir@/drivers
+
+apm_drv_la_SOURCES = \
+         apm_accel.c \
+         apm_cursor.c \
+         apm_dga.c \
+         apm_driver.c \
+         apm.h \
+         apm_i2c.c \
+         apm_regs.h \
+         apm_rush.c
+
+EXTRA_DIST = \
+         apm_funcs.c \
+         apm_video.c