Removed unused files and changed file names to conform to .cmake convention for configuration files.

Signed-off-by: Michele Calgaro <[email protected]>

10 files changed, 3 insertions, 500 deletions

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 2772339..e6571c6 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -73,8 +73,8 @@ set( CMAKE_MODULE_LINKER_FLAGS "${CMAKE_MODULE_LINKER_FLAGS} -Wl,--no-undefined"
 ##### write configure files
 
 configure_file( config.h.cmake config.h @ONLY )
-configure_file( art_config.h.in art_config.h @ONLY )
-configure_file( libart-features.h.in libart-features.h @ONLY )
+configure_file( art_config.h.cmake art_config.h @ONLY )
+configure_file( libart-features.h.cmake libart-features.h @ONLY )
 
 
 include_directories(
@@ -222,7 +222,7 @@ string( REGEX REPLACE "^${CMAKE_INSTALL_PREFIX}" "\${prefix}" exec_prefix ${EXEC
 string( REGEX REPLACE "^${CMAKE_INSTALL_PREFIX}" "\${prefix}" includedir ${INCLUDE_INSTALL_DIR}  )
 string( REGEX REPLACE "^${CMAKE_INSTALL_PREFIX}" "\${prefix}" libdir ${LIB_INSTALL_DIR}          )
 
-configure_file( libart-2.0.pc.in  libart-2.0.pc  @ONLY )
+configure_file( libart-2.0.pc.cmake  libart-2.0.pc  @ONLY )
 
 install(
     FILES ${CMAKE_CURRENT_BINARY_DIR}/libart-2.0.pc
diff --git a/Makefile.am b/Makefile.am
deleted file mode 100644
index 90bdd3b..0000000
--- a/Makefile.am
+++ /dev/null
@@ -1,168 +0,0 @@
-noinst_PROGRAMS = testart testuta
-
-bin_SCRIPTS = \
-	libart2-config
-
-BUILT_SOURCES = art_config.h libart-features.h
-
-EXTRA_DIST = 			\
-	libart.def		\
-	libart-2.0.pc.in	\
-	libart-2.0-uninstalled.pc.in
-
-lib_LTLIBRARIES = libart_lgpl_2.la
-
-if PLATFORM_WIN32
-no_undefined = -no-undefined
-endif
-
-if OS_WIN32
-export_symbols = -export-symbols libart.def
-
-install-libtool-import-lib:
-	$(INSTALL) .libs/libart_lgpl_2.dll.a $(DESTDIR)$(libdir)
-uninstall-libtool-import-lib:
-	-rm $(DESTDIR)$(libdir)/libart_lgpl_2.dll.a
-else
-install-libtool-import-lib:
-uninstall-libtool-import-lib:
-
-libm = -lm
-endif
-
-if MS_LIB_AVAILABLE
-noinst_DATA = art_lgpl_2.lib
-
-install-ms-lib:
-	$(INSTALL) art_lgpl_2.lib $(DESTDIR)$(libdir)
-
-uninstall-ms-lib:
-	-rm $(DESTDIR)$(libdir)/art_lgpl_2.lib
-
-art_lgpl_2.lib : libart_lgpl_2.la
-	lib -name:libart_lgpl_2-@[email protected] -def:libart.def -out:$@
-
-else
-install-ms-lib:
-uninstall-ms-lib:
-endif
-
-libart_lgpl_2_la_SOURCES = \
-	art_affine.c \
-	art_alphagamma.c \
-	art_bpath.c \
-	art_gray_svp.c \
-	art_misc.c \
-	art_pixbuf.c \
-	art_rect.c \
-	art_rect_svp.c \
-	art_rect_uta.c \
-	art_render.c \
-	art_render_gradient.c \
-	art_render_mask.c \
-	art_render_svp.c \
-	art_rgb.c \
-	art_rgb_affine.c \
-	art_rgb_affine_private.c \
-	art_rgb_affine_private.h \
-	art_rgb_bitmap_affine.c \
-	art_rgb_pixbuf_affine.c \
-	art_rgb_rgba_affine.c \
-	art_rgb_a_affine.c \
-	art_rgba.c \
-	art_rgb_svp.c \
-	art_svp.c \
-	art_svp_intersect.c \
-	art_svp_ops.c \
-	art_svp_point.c \
-	art_svp_render_aa.c \
-	art_svp_vpath.c \
-	art_svp_vpath_stroke.c \
-	art_svp_wind.c \
-	art_uta.c \
-	art_uta_ops.c \
-	art_uta_rect.c \
-	art_uta_vpath.c \
-	art_uta_svp.c \
-	art_vpath.c \
-	art_vpath_bpath.c \
-	art_vpath_dash.c \
-	art_vpath_svp.c	\
-	libart-features.c
-
-libart_lgpl_2_la_LDFLAGS = -version-info @LIBART_VERSION_INFO@ $(no_undefined) $(export_symbols)
-libart_lgpl_2_la_LIBADD = $(libm)
-
-libart_lgplincdir = $(includedir)/libart-2.0/libart_lgpl
-libart_lgplinc_HEADERS = \
-	art_affine.h \
-	art_alphagamma.h \
-	art_bpath.h \
-	art_config.h \
-	art_filterlevel.h \
-	art_gray_svp.h \
-	art_misc.h \
-	art_pathcode.h \
-	art_pixbuf.h \
-	art_point.h \
-	art_rect.h \
-	art_rect_svp.h \
-	art_rect_uta.h \
-	art_render.h \
-	art_render_gradient.h \
-	art_render_mask.h \
-	art_render_svp.h \
-	art_rgb.h \
-	art_rgb_affine.h \
-	art_rgb_bitmap_affine.h \
-	art_rgb_pixbuf_affine.h \
-	art_rgb_rgba_affine.h \
-	art_rgb_a_affine.h \
-	art_rgb_svp.h \
-	art_rgba.h \
-	art_svp.h \
-	art_svp_intersect.h \
-	art_svp_ops.h \
-	art_svp_point.h \
-	art_svp_render_aa.h \
-	art_svp_vpath.h \
-	art_svp_vpath_stroke.h \
-	art_svp_wind.h \
-	art_uta.h \
-	art_uta_ops.h \
-	art_uta_rect.h \
-	art_uta_vpath.h \
-	art_uta_svp.h \
-	art_vpath.h \
-	art_vpath_bpath.h \
-	art_vpath_dash.h \
-	art_vpath_svp.h	\
-	libart.h	\
-	libart-features.h
-
-INCLUDES = -I$(top_srcdir) -I$(top_builddir) -DLIBART_COMPILATION
-
-DEPS = $(top_builddir)/libart_lgpl_2.la
-LDADDS = $(top_builddir)/libart_lgpl_2.la
-
-testart_SOURCES=testart.c
-testart_LDFLAGS =
-testart_DEPENDENCIES = $(DEPS)
-testart_LDADD = $(LDADDS) $(libm)
-
-testuta_SOURCES=testuta.c
-testuta_LDFLAGS =
-testuta_DEPENDENCIES = $(DEPS)
-testuta_LDADD = $(LDADDS) $(libm)
-
-tests:	testart testuta
-
-pkgconfigdir = $(libdir)/pkgconfig
-pkgconfig_DATA = libart-2.0.pc
-
-install-data-local: install-ms-lib install-libtool-import-lib
-
-uninstall-local: uninstall-ms-lib uninstall-libtool-import-lib
-
-CLEANFILES = $(BUILT_SOURCES) $(bin_SCRIPTS)
-DISTCLEANFILES = $(BUILT_SOURCES) $(bin_SCRIPTS)
diff --git a/art_config.h.in b/art_config.h.cmake
index cfa4786..cfa4786 100644
--- a/art_config.h.in
+++ b/art_config.h.cmake
diff --git a/config.h.in b/config.h.in
deleted file mode 100644
index 62eff6c..0000000
--- a/config.h.in
+++ /dev/null
@@ -1,109 +0,0 @@
-/* config.h.in.  Generated from configure.in by autoheader.  */
-
-/* Define if building universal (internal helper macro) */
-#undef AC_APPLE_UNIVERSAL_BUILD
-
-/* Define to one of `_getb67', `GETB67', `getb67' for Cray-2 and Cray-YMP
-   systems. This function is required for `alloca.c' support on those systems.
-   */
-#undef CRAY_STACKSEG_END
-
-/* Define to 1 if using `alloca.c'. */
-#undef C_ALLOCA
-
-/* Define to 1 if you have `alloca', as a function or macro. */
-#undef HAVE_ALLOCA
-
-/* Define to 1 if you have <alloca.h> and it should be used (not on Ultrix).
-   */
-#undef HAVE_ALLOCA_H
-
-/* Define to 1 if you have the <dlfcn.h> header file. */
-#undef HAVE_DLFCN_H
-
-/* Define to 1 if you have the <inttypes.h> header file. */
-#undef HAVE_INTTYPES_H
-
-/* Define to 1 if you have the <memory.h> header file. */
-#undef HAVE_MEMORY_H
-
-/* Define to 1 if you have the <stdint.h> header file. */
-#undef HAVE_STDINT_H
-
-/* Define to 1 if you have the <stdlib.h> header file. */
-#undef HAVE_STDLIB_H
-
-/* Define to 1 if you have the <strings.h> header file. */
-#undef HAVE_STRINGS_H
-
-/* Define to 1 if you have the <string.h> header file. */
-#undef HAVE_STRING_H
-
-/* Define to 1 if you have the <sys/stat.h> header file. */
-#undef HAVE_SYS_STAT_H
-
-/* Define to 1 if you have the <sys/types.h> header file. */
-#undef HAVE_SYS_TYPES_H
-
-/* Define to 1 if you have the <unistd.h> header file. */
-#undef HAVE_UNISTD_H
-
-/* Define to the sub-directory in which libtool stores uninstalled libraries.
-   */
-#undef LT_OBJDIR
-
-/* Name of package */
-#undef PACKAGE
-
-/* Define to the address where bug reports for this package should be sent. */
-#undef PACKAGE_BUGREPORT
-
-/* Define to the full name of this package. */
-#undef PACKAGE_NAME
-
-/* Define to the full name and version of this package. */
-#undef PACKAGE_STRING
-
-/* Define to the one symbol short name of this package. */
-#undef PACKAGE_TARNAME
-
-/* Define to the version of this package. */
-#undef PACKAGE_VERSION
-
-/* The size of `char', as computed by sizeof. */
-#undef SIZEOF_CHAR
-
-/* The size of `int', as computed by sizeof. */
-#undef SIZEOF_INT
-
-/* The size of `long', as computed by sizeof. */
-#undef SIZEOF_LONG
-
-/* The size of `short', as computed by sizeof. */
-#undef SIZEOF_SHORT
-
-/* If using the C implementation of alloca, define if you know the
-   direction of stack growth for your system; otherwise it will be
-   automatically deduced at runtime.
-	STACK_DIRECTION > 0 => grows toward higher addresses
-	STACK_DIRECTION < 0 => grows toward lower addresses
-	STACK_DIRECTION = 0 => direction of growth unknown */
-#undef STACK_DIRECTION
-
-/* Define to 1 if you have the ANSI C header files. */
-#undef STDC_HEADERS
-
-/* Version number of package */
-#undef VERSION
-
-/* Define WORDS_BIGENDIAN to 1 if your processor stores words with the most
-   significant byte first (like Motorola and SPARC, unlike Intel). */
-#if defined AC_APPLE_UNIVERSAL_BUILD
-# if defined __BIG_ENDIAN__
-#  define WORDS_BIGENDIAN 1
-# endif
-#else
-# ifndef WORDS_BIGENDIAN
-#  undef WORDS_BIGENDIAN
-# endif
-#endif
diff --git a/configure.in b/configure.in
deleted file mode 100644
index d7aeaf9..0000000
--- a/configure.in
+++ /dev/null
@@ -1,137 +0,0 @@
-m4_define([libart_major_version], [2])
-m4_define([libart_minor_version], [3])
-m4_define([libart_micro_version], [21])
-m4_define([libart_version],
-          [libart_major_version.libart_minor_version.libart_micro_version])
-
-AC_INIT([libart-lgpl],[libart_version],[http://bugzilla.gnome.org/enter_bug.cgi?product=libart],[libart_lgpl])
-
-AC_CONFIG_HEADERS([config.h])
-
-LIBART_MAJOR_VERSION=libart_major_version
-LIBART_MINOR_VERSION=libart_minor_version
-LIBART_MICRO_VERSION=libart_micro_version
-LIBART_VERSION=libart_version
-
-LIBART_VERSION_INFO=`expr $LIBART_MAJOR_VERSION + $LIBART_MINOR_VERSION`:$LIBART_MICRO_VERSION:$LIBART_MINOR_VERSION
-
-AC_SUBST(LIBART_MAJOR_VERSION)
-AC_SUBST(LIBART_MINOR_VERSION)
-AC_SUBST(LIBART_MICRO_VERSION)
-AC_SUBST(LIBART_VERSION)
-AC_SUBST(LIBART_VERSION_INFO)
-
-AM_INIT_AUTOMAKE([1.9 foreign no-dist-gzip dist-bzip2])
-
-AC_ARG_ENABLE(ansi, [  --enable-ansi           turn on strict ansi [default=no]],
-		    , enable_ansi=no)
-
-AC_PROG_CC
-AC_PROG_CPP
-AC_LIBTOOL_WIN32_DLL
-AM_PROG_LIBTOOL
-
-AM_MAINTAINER_MODE
-
-AC_MSG_CHECKING([for some Win32 platform])
-case "$host" in
-  *-*-mingw*|*-*-cygwin*)
-    platform_win32=yes
-    ;;
-  *)
-    platform_win32=no
-    ;;
-esac
-AC_MSG_RESULT([$platform_win32])
-AM_CONDITIONAL(PLATFORM_WIN32, test "$platform_win32" = "yes")
-
-AC_MSG_CHECKING([for native Win32])
-case "$host" in
-  *-*-mingw*)
-    os_win32=yes
-    ;;
-  *)
-    os_win32=no
-    ;;
-esac
-AC_MSG_RESULT([$os_win32])
-AM_CONDITIONAL(OS_WIN32, test "$os_win32" = "yes")
-
-if test "$os_win32" = "yes"; then
-  AC_CHECK_PROG(ms_librarian, lib.exe, yes, no)
-fi
-AM_CONDITIONAL(MS_LIB_AVAILABLE, test x$ms_librarian = xyes)
-
-changequote(,)dnl
-if test "x$GCC" = "xyes"; then
-  case " $CFLAGS " in
-  *[\ \	]-Wall[\ \	]*) ;;
-  *) CFLAGS="$CFLAGS -Wall" ;;
-  esac
-
-  case " $CFLAGS " in
-  *[\ \	]-Wmissing-prototypes[\ \	]*) ;;
-  *) CFLAGS="$CFLAGS -Wmissing-prototypes" ;;
-  esac
-
-  if test "x$enable_ansi" = "xyes"; then
-    case " $CFLAGS " in
-    *[\ \	]-ansi[\ \	]*) ;;
-    *) CFLAGS="$CFLAGS -ansi" ;;
-    esac
-
-    case " $CFLAGS " in
-    *[\ \	]-pedantic[\ \	]*) ;;
-    *) CFLAGS="$CFLAGS -pedantic" ;;
-    esac
-  fi
-fi
-changequote([,])dnl
-
-AC_FUNC_ALLOCA
-
-AC_C_BIGENDIAN
-
-AC_CHECK_SIZEOF(char)
-AC_SUBST(ART_SIZEOF_CHAR, $ac_cv_sizeof_char)
-AC_CHECK_SIZEOF(short)
-AC_SUBST(ART_SIZEOF_SHORT, $ac_cv_sizeof_short)
-AC_CHECK_SIZEOF(int)
-AC_SUBST(ART_SIZEOF_INT, $ac_cv_sizeof_int)
-AC_CHECK_SIZEOF(long)
-AC_SUBST(ART_SIZEOF_LONG, $ac_cv_sizeof_long)
-
-if test $ART_SIZEOF_CHAR -eq 1; then
-  AC_SUBST( ART_U8_TYPE, "unsigned char" )
-else
-  echo 1>&2 "sizeof(char) != 1"
-  exit 1
-fi
-
-if test $ART_SIZEOF_SHORT -eq 2; then
-  AC_SUBST( ART_U16_TYPE, "unsigned short" )
-else
-  echo 1>&2 "sizeof(short) != 2"
-  exit 2
-fi
-
-if test $ART_SIZEOF_INT -eq 4; then
-  AC_SUBST( ART_U32_TYPE, "unsigned int" )
-else
-  if test $ART_SIZEOF_LONG -eq 4; then
-    AC_SUBST( ART_U32_TYPE, "unsigned long" )
-  else
-    echo 1>&2 "sizeof(int) != 4 and sizeof(long) != 4"
-    exit 3
-  fi
-fi
-
-AC_CONFIG_FILES([
-art_config.h
-libart-features.h
-Makefile
-libart-2.0.pc
-libart-2.0-uninstalled.pc
-libart-zip])
-
-AC_OUTPUT
diff --git a/gen_art_config.sh.in b/gen_art_config.sh.in
deleted file mode 100644
index 8c525bd..0000000
--- a/gen_art_config.sh.in
+++ /dev/null
@@ -1,49 +0,0 @@
-#!/bin/sh
-
-# A little utility function to generate header info.
-#
-# The output of this program is generally written to art_config.h,
-# which is installed in libart's include dir.
-
-
-echo "/* Automatically generated by gen_art_config */"
-echo
-echo "#ifndef _ART_CONFIG_H_"
-echo "#define _ART_CONFIG_H_"
-echo
-echo "#define ART_SIZEOF_CHAR @ART_SIZEOF_CHAR@"
-echo "#define ART_SIZEOF_SHORT @ART_SIZEOF_SHORT@"
-echo "#define ART_SIZEOF_INT @ART_SIZEOF_INT@"
-echo "#define ART_SIZEOF_LONG @ART_SIZEOF_LONG@"
-echo
-
-if test @ART_SIZEOF_CHAR@ -eq 1; then
-  echo "typedef unsigned char art_u8;"
-else
-  echo 1>&2 "sizeof(char) != 1"
-  exit 1
-fi
-
-if test @ART_SIZEOF_SHORT@ -eq 2; then
-  echo "typedef unsigned short art_u16;"
-else
-  echo 1>&2 "sizeof(short) != 2"
-  exit 2
-fi
-
-if test @ART_SIZEOF_INT@ -eq 4; then
-  echo "typedef unsigned int art_u32;"
-else
-  if test @ART_SIZEOF_LONG@ -eq 4; then
-    echo "typedef unsigned long art_u32;"
-  else
-    echo 1>&2 "sizeof(int) != 4 and sizeof(long) != 4"
-	exit 3
-  fi
-fi
-
-echo
-echo "#endif /* _ART_CONFIG_H_ */"
-
-exit 0
-}
diff --git a/libart-2.0-uninstalled.pc.in b/libart-2.0-uninstalled.pc.in
deleted file mode 100644
index 6dddc9d..0000000
--- a/libart-2.0-uninstalled.pc.in
+++ /dev/null
@@ -1,10 +0,0 @@
-prefix=@prefix@
-exec_prefix=@exec_prefix@
-libdir=@libdir@
-includedir=@includedir@
-
-Name: libart
-Description: LGPL version of the libart library
-Version: @LIBART_VERSION@
-Libs: ${pc_top_builddir}/${pcfiledir}/libart_lgpl_2.la
-Cflags: -I${pc_top_builddir}/${pcfiledir}
diff --git a/libart-2.0.pc.in b/libart-2.0.pc.cmake
index 063e1f5..063e1f5 100644
--- a/libart-2.0.pc.in
+++ b/libart-2.0.pc.cmake
diff --git a/libart-features.h.in b/libart-features.h.cmake
index 7ac16c9..7ac16c9 100644
--- a/libart-features.h.in
+++ b/libart-features.h.cmake
diff --git a/libart-zip.in b/libart-zip.in
deleted file mode 100755
index 7dfd048..0000000
--- a/libart-zip.in
+++ /dev/null
@@ -1,24 +0,0 @@
-#!/bin/sh
-
-# Build zipfiles for libart_lgpl on Win32, runtime and developer.
-
-ZIP=/tmp/libart_lgpl-@[email protected]
-DEVZIP=/tmp/libart_lgpl-dev-@[email protected]
-cd @prefix@
-
-rm $ZIP
-
-DLLDIR=lib
-[ -f bin/libart_lgpl_2-@[email protected] ] && DLLDIR=bin
-
-zip -r $ZIP -@ <<EOF
-$DLLDIR/libart_lgpl_2-@[email protected]
-EOF
-
-rm $DEVZIP
-zip -r $DEVZIP -@ <<EOF
-include/libart-2.0
-lib/libart_lgpl_2.dll.a
-lib/art_lgpl_2.lib
-lib/pkgconfig/libart-2.0.pc
-EOF