67 lines
2.1 KiB
Diff
67 lines
2.1 KiB
Diff
--- ../pixman-0.9.4.orig/Makefile.am 2007-08-21 22:15:29.950632500 +0200
|
|
+++ ./Makefile.am 2007-08-21 22:20:47.882502000 +0200
|
|
@@ -1,6 +1,6 @@
|
|
SUBDIRS = pixman test
|
|
|
|
pkgconfigdir=$(libdir)/pkgconfig
|
|
-pkgconfig_DATA=pixman-1.pc
|
|
+pkgconfig_DATA=pixman.pc
|
|
|
|
-$(pkgconfig_DATA): pixman-1.pc.in
|
|
+$(pkgconfig_DATA): pixman.pc.in
|
|
--- ../pixman-0.9.4.orig/configure.ac 2007-08-21 22:15:29.966633500 +0200
|
|
+++ ./configure.ac 2007-08-21 22:22:54.362406500 +0200
|
|
@@ -125,7 +125,7 @@
|
|
AC_SUBST(DEP_CFLAGS)
|
|
AC_SUBST(DEP_LIBS)
|
|
|
|
-AC_OUTPUT([pixman-1.pc
|
|
+AC_OUTPUT([pixman.pc
|
|
Makefile
|
|
pixman/Makefile
|
|
test/Makefile])
|
|
--- ../pixman-0.9.4.orig/pixman/Makefile.am 2007-08-21 22:15:28.750557500 +0200
|
|
+++ ./pixman/Makefile.am 2007-08-21 22:29:32.375280750 +0200
|
|
@@ -1,7 +1,7 @@
|
|
-lib_LTLIBRARIES = libpixman-1.la
|
|
-libpixman_1_la_LDFLAGS = -version-info $(LT_VERSION_INFO)
|
|
-libpixman_1_la_LIBADD = @DEP_LIBS@ -lm libpixmanwrapper.la
|
|
-libpixman_1_la_SOURCES = \
|
|
+lib_LTLIBRARIES = libpixman.la
|
|
+libpixman_la_LDFLAGS = -version-info $(LT_VERSION_INFO)
|
|
+libpixman_la_LIBADD = @DEP_LIBS@ -lm libpixmanwrapper.la
|
|
+libpixman_la_SOURCES = \
|
|
pixman.h \
|
|
pixman-region.c \
|
|
pixman-private.h \
|
|
@@ -15,7 +15,7 @@
|
|
pixman-compute-region.c \
|
|
pixman-timer.c
|
|
|
|
-libpixmanincludedir = $(includedir)/pixman-1/
|
|
+libpixmanincludedir = $(includedir)/
|
|
libpixmaninclude_HEADERS = pixman.h
|
|
|
|
# wrapper library
|
|
@@ -35,5 +35,5 @@
|
|
pixman-mmx.h
|
|
libpixman_mmx_la_CFLAGS = $(DEP_CFLAGS) $(MMX_CFLAGS)
|
|
libpixman_mmx_la_LIBADD = $(DEP_LIBS)
|
|
-libpixman_1_la_LIBADD += libpixman-mmx.la
|
|
+libpixman_la_LIBADD += libpixman-mmx.la
|
|
endif
|
|
--- ../pixman-0.9.4.orig/test/Makefile.am 2007-08-21 22:15:31.722743250 +0200
|
|
+++ ./test/Makefile.am 2007-08-21 22:34:40.038508500 +0200
|
|
@@ -7,7 +7,7 @@
|
|
|
|
INCLUDES = -I$(top_srcdir)/pixman $(GTK_CFLAGS)
|
|
|
|
-composite_test_LDADD = $(top_builddir)/pixman/libpixman-1.la $(GTK_LIBS)
|
|
-gradient_test_LDADD = $(top_builddir)/pixman/libpixman-1.la $(GTK_LIBS)
|
|
+composite_test_LDADD = $(top_builddir)/pixman/libpixman.la $(GTK_LIBS)
|
|
+gradient_test_LDADD = $(top_builddir)/pixman/libpixman.la $(GTK_LIBS)
|
|
|
|
-endif
|
|
\ No newline at end of file
|
|
+endif
|