Commit 892ec5a0 authored by Elliot Lee's avatar Elliot Lee

Make it all compile for real.



Make it all compile for real.
parent 5a979007
2000-01-10 Elliot Lee <sopwith@redhat.com>
* Makefile.am, *.h: Add rather bad hacks to the header files to allow compilation
* Makefile.am: Distribute libart-config.in
2000-01-09 Raph Levien <raph@gimp.org>
......
......@@ -43,7 +43,8 @@ libart_lgpl_la_SOURCES = \
art_vpath.c \
art_vpath_bpath.c \
art_vpath_dash.c \
art_vpath_svp.c
art_vpath_svp.c \
libart-features.c
libart_lgpl_la_LDFLAGS = -version-info @LIBART_VERSION_INFO@
......@@ -82,9 +83,11 @@ libart_lgplinc_HEADERS = \
art_vpath.h \
art_vpath_bpath.h \
art_vpath_dash.h \
art_vpath_svp.h
art_vpath_svp.h \
libart.h \
libart-features.h
INCLUDES = -I$(top_srcdir)/..
INCLUDES = -I$(top_srcdir) -I$(top_builddir) -DLIBART_COMPILATION
DEPS = $(top_builddir)/libart_lgpl.la
LDADDS = $(top_builddir)/libart_lgpl.la
......
......@@ -20,7 +20,11 @@
#ifndef __ART_AFFINE_H__
#define __ART_AFFINE_H__
#ifdef LIBART_COMPILATION
#include "art_point.h"
#else
#include <libart_lgpl/art_point.h>
#endif
#ifdef __cplusplus
extern "C" {
......
......@@ -26,6 +26,12 @@
extern "C" {
#endif /* __cplusplus */
#ifdef LIBART_COMPILATION
#include "art_misc.h"
#else
#include <libart_lgpl/art_misc.h>
#endif
typedef struct _ArtAlphaGamma ArtAlphaGamma;
struct _ArtAlphaGamma {
......
......@@ -20,8 +20,13 @@
#ifndef __ART_BPATH_H__
#define __ART_BPATH_H__
#ifdef LIBART_COMPILATION
#include "art_point.h"
#include "art_pathcode.h"
#else
#include <libart_lgpl/art_point.h>
#include <libart_lgpl/art_pathcode.h>
#endif
/* Basic data structures and constructors for bezier paths */
......
......@@ -22,6 +22,12 @@
#ifndef __ART_GRAY_SVP_H__
#define __ART_GRAY_SVP_H__
#ifdef LIBART_COMPILATION
#include "art_svp.h"
#else
#include <libart_lgpl/art_svp.h>
#endif
#ifdef __cplusplus
extern "C" {
#endif /* __cplusplus */
......
......@@ -20,6 +20,12 @@
#ifndef __ART_RECT_UTA_H__
#define __ART_RECT_UTA_H__
#ifdef LIBART_COMPILATION
#include "art_uta.h"
#else
#include <libart_lgpl/art_uta.h>
#endif
#ifdef __cplusplus
extern "C" {
#endif /* __cplusplus */
......
......@@ -23,8 +23,13 @@
/* This module handles compositing of affine-transformed rgb images
over rgb pixel buffers. */
#ifdef LIBART_COMPILATION
#include "art_filterlevel.h"
#include "art_alphagamma.h"
#else
#include <libart_lgpl/art_filterlevel.h>
#include <libart_lgpl/art_alphagamma.h>
#endif
#ifdef __cplusplus
extern "C" {
......
......@@ -23,8 +23,13 @@
/* This module handles compositing of affine-transformed bitmap images
over rgb pixel buffers. */
#ifdef LIBART_COMPILATION
#include "art_filterlevel.h"
#include "art_alphagamma.h"
#else
#include <libart_lgpl/art_filterlevel.h>
#include <libart_lgpl/art_alphagamma.h>
#endif
#ifdef __cplusplus
extern "C" {
......
......@@ -23,8 +23,13 @@
/* This module handles compositing of affine-transformed rgba images
over rgb pixel buffers. */
#ifdef LIBART_COMPILATION
#include "art_filterlevel.h"
#include "art_alphagamma.h"
#else
#include <libart_lgpl/art_filterlevel.h>
#include <libart_lgpl/art_alphagamma.h>
#endif
#ifdef __cplusplus
extern "C" {
......
......@@ -22,7 +22,11 @@
/* Render a sorted vector path into an RGB buffer. */
#ifdef LIBART_COMPILATION
#include "art_alphagamma.h"
#else
#include <libart_lgpl/art_alphagamma.h>
#endif
#ifdef __cplusplus
extern "C" {
......
......@@ -22,8 +22,13 @@
/* Basic data structures and constructors for sorted vector paths */
#ifdef LIBART_COMPILATION
#include "art_rect.h"
#include "art_point.h"
#else
#include <libart_lgpl/art_rect.h>
#include <libart_lgpl/art_point.h>
#endif
#ifdef __cplusplus
extern "C" {
......
......@@ -20,6 +20,12 @@
#ifndef __ART_SVP_VPATH_H__
#define __ART_SVP_VPATH_H__
#ifdef LIBART_COMPILATION
#include "art_vpath.h"
#else
#include <libart_lgpl/art_vpath.h>
#endif
/* Sort vector paths into sorted vector paths. */
#ifdef __cplusplus
......
......@@ -20,8 +20,13 @@
#ifndef __ART_VPATH_H__
#define __ART_VPATH_H__
#ifdef LIBART_COMPILATION
#include "art_rect.h"
#include "art_pathcode.h"
#else
#include <libart_lgpl/art_rect.h>
#include <libart_lgpl/art_pathcode.h>
#endif
/* Basic data structures and constructors for simple vector paths */
......
......@@ -22,8 +22,13 @@
/* "Unsort" a sorted vector path into an ordinary vector path. */
#ifdef LIBART_COMPILATION
#include "art_rect.h"
#include "art_point.h"
#else
#include <libart_lgpl/art_rect.h>
#include <libart_lgpl/art_point.h>
#endif
#ifdef __cplusplus
extern "C" {
......
......@@ -7,6 +7,11 @@ DIE=0
PROJECT=LibArt_LGPL
srcdir=`dirname $0`
test -z "$srcdir" && srcdir=.
THISDIR="`pwd`"
cd $srcdir
(autoconf --version) < /dev/null > /dev/null 2>&1 || {
echo
echo "You must have autoconf installed to compile $PROJECT."
......@@ -55,7 +60,8 @@ do
autoheader; automake --add-missing --gnu $am_opt; autoconf)
done
./configure "$@"
cd $THISDIR
$srcdir/configure "$@"
echo
echo "Now type 'make' to compile $PROJECT."
......@@ -58,5 +58,6 @@ AC_SUBST(LIBART_LIBS)
AC_C_BIGENDIAN
AC_OUTPUT([
libart-features.h
Makefile
libart-config], [case "$CONFIG_FILES" in *libart-config*) chmod +x libart-config;; esac])
#include "libart-features.h"
/* General initialization hooks */
const unsigned int libart_major_version=LIBART_MAJOR_VERSION,
libart_minor_version=LIBART_MINOR_VERSION,
libart_micro_version=LIBART_MICRO_VERSION;
const char *libart_version = LIBART_VERSION;
void
libart_preinit(void *app, void *modinfo)
{
}
void
libart_postinit(void *app, void *modinfo)
{
}
#ifndef LIBART_FEATURES_H
#define LIBART_FEATURES_H 1
#define LIBART_MAJOR_VERSION (@LIBART_MAJOR_VERSION@)
#define LIBART_MINOR_VERSION (@LIBART_MINOR_VERSION@)
#define LIBART_MICRO_VERSION (@LIBART_MICRO_VERSION@)
#define LIBART_VERSION "@LIBART_VERSION@"
extern const unsigned int libart_major_version, libart_minor_version, libart_micro_version;
extern const char *libart_version;
void libart_preinit(void *app, void *modinfo);
void libart_postinit(void *app, void *modinfo);
#endif
#ifndef LIBART_H
#define LIBART_H 1
#include <libart_lgpl/art_affine.h>
#include <libart_lgpl/art_alphagamma.h>
#include <libart_lgpl/art_bpath.h>
#include <libart_lgpl/art_filterlevel.h>
#include <libart_lgpl/art_gray_svp.h>
#include <libart_lgpl/art_misc.h>
#include <libart_lgpl/art_pathcode.h>
#include <libart_lgpl/art_pixbuf.h>
#include <libart_lgpl/art_point.h>
#include <libart_lgpl/art_rect.h>
#include <libart_lgpl/art_rect_svp.h>
#include <libart_lgpl/art_rect_uta.h>
#include <libart_lgpl/art_rgb.h>
#include <libart_lgpl/art_rgb_affine.h>
#include <libart_lgpl/art_rgb_bitmap_affine.h>
#include <libart_lgpl/art_rgb_pixbuf_affine.h>
#include <libart_lgpl/art_rgb_rgba_affine.h>
#include <libart_lgpl/art_rgb_svp.h>
#include <libart_lgpl/art_svp.h>
#include <libart_lgpl/art_svp_ops.h>
#include <libart_lgpl/art_svp_point.h>
#include <libart_lgpl/art_svp_render_aa.h>
#include <libart_lgpl/art_svp_vpath.h>
#include <libart_lgpl/art_svp_vpath_stroke.h>
#include <libart_lgpl/art_svp_wind.h>
#include <libart_lgpl/art_uta.h>
#include <libart_lgpl/art_uta_ops.h>
#include <libart_lgpl/art_uta_rect.h>
#include <libart_lgpl/art_uta_svp.h>
#include <libart_lgpl/art_uta_vpath.h>
#include <libart_lgpl/art_vpath.h>
#include <libart_lgpl/art_vpath_bpath.h>
#include <libart_lgpl/art_vpath_dash.h>
#include <libart_lgpl/art_vpath_svp.h>
#endif
......@@ -62,7 +62,7 @@ dnl
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include <libart/art_uta.h>
#include <libart_lgpl/libart.h>
char*
my_strdup (char *str)
......@@ -136,7 +136,7 @@ int main ()
LIBS="$LIBS $LIBART_LIBS"
AC_TRY_LINK([
#include <stdio.h>
#include <libart.h>
#include <libart_lgpl/libart.h>
], [ return 0; ],
[ echo "*** The test program compiled, but did not run. This usually means"
echo "*** that the run-time linker is not finding LIBART or finding the wrong"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment