radeon/avivotool: automake/autoconfisize

3 files changed, 68 insertions, 16 deletions

diff --git a/Makefile b/Makefile
deleted file mode 100644
index 632360b..0000000
--- a/Makefile
+++ /dev/null
@@ -1,16 +0,0 @@
-CFLAGS = `pkg-config --cflags pciaccess` -Wall -g -I.
-LDFLAGS = `pkg-config --libs pciaccess`
-
-AVIVO_OBJS := atom.o avivotool.o xf86i2c.o atombios_tables.o
-
-all: radeontool avivotool
-
-
-radeontool: radeontool.c
-	gcc $(CFLAGS) radeontool.c -o radeontool $(LDFLAGS)
-
-avivotool: $(AVIVO_OBJS)
-	gcc $(CFLAGS) -I. -Wall -O2 $(AVIVO_OBJS) -o avivotool $(LDFLAGS)
-
-clean:	
-	rm -f radeontool avivotool $(AVIVO_OBJS)
diff --git a/Makefile.am b/Makefile.am
new file mode 100644
index 0000000..9915a16
--- /dev/null
+++ b/Makefile.am
@@ -0,0 +1,33 @@
+#  Copyright 2009 Dave Airlie
+#
+#  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
+#  THE AUTHORS 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.
+
+AUTOMAKE_OPTIONS = foreign
+
+bin_PROGRAMS = radeontool avivotool
+
+AM_CFLAGS = $(LIBPCIACCESS_CFLAGS)
+
+radeontool_SOURCES = radeontool.c radeon_reg.h xf86i2c.h radeon.h radeon_chipinfo_gen.h
+avivotool_SOURCES = avivotool.c atom.c xf86i2c.c atombios_tables.c \
+		atombios.h atom.h atom-bits.h radeon.h radeon_chipinfo_gen.h \
+		atom-types.h kernel-compat.h ObjectID.h atom-names.h
+
+radeontool_LDADD = $(LIBPCIACCESS_LIBS)
+avivotool_LDADD = $(LIBPCIACCESS_LIBS)
diff --git a/configure.ac b/configure.ac
new file mode 100644
index 0000000..fec2edb
--- /dev/null
+++ b/configure.ac
@@ -0,0 +1,35 @@
+#  Copyright 2009 Dave Airlie
+#
+#  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
+#  THE AUTHORS 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.60])
+AC_INIT([radeontool], 1.6.0, [xorg-driver-ati@lists.x.org], radeontool)
+AM_INIT_AUTOMAKE([dist-bzip2])
+
+#AM_CONFIG_HEADER([config.h])
+
+AC_PROG_LIBTOOL
+
+AC_DISABLE_STATIC
+AC_PROG_CC
+AC_PROG_INSTALL
+
+PKG_CHECK_MODULES(LIBPCIACCESS, pciaccess)
+
+AC_OUTPUT([Makefile])