Benjamin Otte
2007-Oct-19 20:23 UTC
[Swfdec] 4 commits - configure.ac data/.gitignore data/icons data/Makefile.am data/swfdec-gtk.pc.in data/swfdec.pc.in .gitignore Makefile.am player/swfplay.c swfdec-gtk.pc.in swfdec.pc.in
.gitignore | 3
Makefile.am | 16 --
configure.ac | 11 +
data/.gitignore | 3
data/Makefile.am | 30 +++
data/icons/22x22/Makefile.am | 2
data/icons/22x22/swfdec.png |binary
data/icons/24x24/Makefile.am | 2
data/icons/24x24/swfdec.png |binary
data/icons/32x32/Makefile.am | 2
data/icons/32x32/swfdec.png |binary
data/icons/48x48/Makefile.am | 2
data/icons/48x48/swfdec.png |binary
data/icons/Makefile.am | 1
data/icons/scalable/Makefile.am | 2
data/icons/scalable/swfdec.svg | 320 ++++++++++++++++++++++++++++++++++++++++
data/swfdec-gtk.pc.in | 11 +
data/swfdec.pc.in | 11 +
player/swfplay.c | 1
swfdec-gtk.pc.in | 11 -
swfdec.pc.in | 11 -
21 files changed, 397 insertions(+), 42 deletions(-)
New commits:
commit 35430ec179d9a054b6ff8c2ac99584d50f5abdb0
Author: Benjamin Otte <otte at gnome.org>
Date: Fri Oct 19 22:23:30 2007 +0200
set our cool new icon
diff --git a/player/swfplay.c b/player/swfplay.c
index f9b2fb3..d976358 100644
--- a/player/swfplay.c
+++ b/player/swfplay.c
@@ -50,6 +50,7 @@ view_swf (SwfdecPlayer *player, gboolean use_image)
GtkWidget *window, *widget;
window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
+ gtk_window_set_icon_name (GTK_WINDOW (window), "swfdec");
widget = swfdec_gtk_widget_new (player);
if (use_image)
swfdec_gtk_widget_set_renderer (SWFDEC_GTK_WIDGET (widget),
CAIRO_SURFACE_TYPE_IMAGE);
commit fbdc3c6f51fcfe0f33c53d5d173cbe1d5f1d87c2
Author: Benjamin Otte <otte at gnome.org>
Date: Fri Oct 19 22:23:21 2007 +0200
update icon cache after install
diff --git a/data/Makefile.am b/data/Makefile.am
index f545daf..a4f0296 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -15,3 +15,16 @@ swfdec- at SWFDEC_MAJORMINOR@.pc: swfdec.pc
swfdec-gtk- at SWFDEC_MAJORMINOR@.pc: swfdec-gtk.pc
cp swfdec-gtk.pc swfdec-gtk- at SWFDEC_MAJORMINOR@.pc
+gtk_update_icon_cache = gtk-update-icon-cache -f -t $(datadir)/icons/hicolor
+
+install-data-hook: update-icon-cache
+uninstall-hook: update-icon-cache
+
+update-icon-cache:
+ @-if test -z "$(DESTDIR)"; then \
+ echo "Updating Gtk icon cache."; \
+ $(gtk_update_icon_cache); \
+ else \
+ echo "*** Icon cache not updated. After (un)install, run this:"; \
+ echo "*** $(gtk_update_icon_cache)"; \
+ fi
commit 0f074bc242b61347c297f142b1c627128b5e3dbd
Author: Cris <krigenator at gmail.com>
Date: Fri Oct 19 22:00:03 2007 +0200
add a logo
diff --git a/configure.ac b/configure.ac
index d1f728d..04ada89 100644
--- a/configure.ac
+++ b/configure.ac
@@ -318,6 +318,12 @@ dnl testsuite/Makefile
AC_CONFIG_FILES(
Makefile
data/Makefile
+data/icons/Makefile
+data/icons/22x22/Makefile
+data/icons/24x24/Makefile
+data/icons/32x32/Makefile
+data/icons/48x48/Makefile
+data/icons/scalable/Makefile
data/swfdec.pc
data/swfdec-gtk.pc
doc/Makefile
diff --git a/data/Makefile.am b/data/Makefile.am
index 6479fe5..f545daf 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -1,3 +1,5 @@
+SUBDIRS = icons
+
pkgconfigdir = $(libdir)/pkgconfig
if WITH_GTK
pkgconfig_DATA = swfdec- at SWFDEC_MAJORMINOR@.pc swfdec-gtk- at
SWFDEC_MAJORMINOR@.pc
diff --git a/data/icons/22x22/Makefile.am b/data/icons/22x22/Makefile.am
new file mode 100644
index 0000000..cae3af2
--- /dev/null
+++ b/data/icons/22x22/Makefile.am
@@ -0,0 +1,2 @@
+icondir = $(datadir)/icons/hicolor/22x22/apps
+icon_DATA = swfdec.png
diff --git a/data/icons/22x22/swfdec.png b/data/icons/22x22/swfdec.png
new file mode 100644
index 0000000..52ac41e
Binary files /dev/null and b/data/icons/22x22/swfdec.png differ
diff --git a/data/icons/24x24/Makefile.am b/data/icons/24x24/Makefile.am
new file mode 100644
index 0000000..b9f1df7
--- /dev/null
+++ b/data/icons/24x24/Makefile.am
@@ -0,0 +1,2 @@
+icondir = $(datadir)/icons/hicolor/24x24/apps
+icon_DATA = swfdec.png
diff --git a/data/icons/24x24/swfdec.png b/data/icons/24x24/swfdec.png
new file mode 100644
index 0000000..78084d4
Binary files /dev/null and b/data/icons/24x24/swfdec.png differ
diff --git a/data/icons/32x32/Makefile.am b/data/icons/32x32/Makefile.am
new file mode 100644
index 0000000..fc3acd9
--- /dev/null
+++ b/data/icons/32x32/Makefile.am
@@ -0,0 +1,2 @@
+icondir = $(datadir)/icons/hicolor/32x32/apps
+icon_DATA = swfdec.png
diff --git a/data/icons/32x32/swfdec.png b/data/icons/32x32/swfdec.png
new file mode 100644
index 0000000..f81c69e
Binary files /dev/null and b/data/icons/32x32/swfdec.png differ
diff --git a/data/icons/48x48/Makefile.am b/data/icons/48x48/Makefile.am
new file mode 100644
index 0000000..9fadb13
--- /dev/null
+++ b/data/icons/48x48/Makefile.am
@@ -0,0 +1,2 @@
+icondir = $(datadir)/icons/hicolor/48x48/apps
+icon_DATA = swfdec.png
diff --git a/data/icons/48x48/swfdec.png b/data/icons/48x48/swfdec.png
new file mode 100644
index 0000000..c5ca6cb
Binary files /dev/null and b/data/icons/48x48/swfdec.png differ
diff --git a/data/icons/Makefile.am b/data/icons/Makefile.am
new file mode 100644
index 0000000..9e8dc55
--- /dev/null
+++ b/data/icons/Makefile.am
@@ -0,0 +1 @@
+SUBDIRS = 22x22 24x24 32x32 48x48 scalable
diff --git a/data/icons/scalable/Makefile.am b/data/icons/scalable/Makefile.am
new file mode 100644
index 0000000..b59c0dc
--- /dev/null
+++ b/data/icons/scalable/Makefile.am
@@ -0,0 +1,2 @@
+icondir = $(datadir)/icons/hicolor/scalable/apps
+icon_DATA = swfdec.svg
diff --git a/data/icons/scalable/swfdec.svg b/data/icons/scalable/swfdec.svg
new file mode 100644
index 0000000..46a5e4c
--- /dev/null
+++ b/data/icons/scalable/swfdec.svg
@@ -0,0 +1,320 @@
+<?xml version="1.0" encoding="UTF-8"
standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<svg
+ xmlns:dc="http://purl.org/dc/elements/1.1/"
+ xmlns:cc="http://web.resource.org/cc/"
+ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+ xmlns:svg="http://www.w3.org/2000/svg"
+ xmlns="http://www.w3.org/2000/svg"
+ xmlns:xlink="http://www.w3.org/1999/xlink"
+
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+ xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+ width="64px"
+ height="64px"
+ id="svg2160"
+ sodipodi:version="0.32"
+ inkscape:version="0.45.1"
+ sodipodi:docbase="/home/cris/Desktop"
+ sodipodi:docname="swfdec_logo+lightning_mod.svg"
+ inkscape:output_extension="org.inkscape.output.svg.inkscape">
+ <defs
+ id="defs2162">
+ <linearGradient
+ id="linearGradient6086">
+ <stop
+ id="stop6089"
+ offset="0"
+ style="stop-color:#ffffff;stop-opacity:0.5;" />
+ <stop
+ style="stop-color:#daeb7f;stop-opacity:0.5;"
+ offset="0.25"
+ id="stop6097" />
+ <stop
+ style="stop-color:#b5d700;stop-opacity:0.48958334;"
+ offset="0.5"
+ id="stop6091" />
+ <stop
+ id="stop6093"
+ offset="1"
+ style="stop-color:#5d7f00;stop-opacity:0;" />
+ </linearGradient>
+ <linearGradient
+ id="linearGradient3167">
+ <stop
+ style="stop-color:#000000;stop-opacity:1;"
+ offset="0"
+ id="stop3169" />
+ <stop
+ style="stop-color:#3d421a;stop-opacity:1;"
+ offset="1"
+ id="stop3171" />
+ </linearGradient>
+ <linearGradient
+ id="linearGradient7077">
+ <stop
+ id="stop7079"
+ offset="0"
+ style="stop-color:#ffffff;stop-opacity:1;" />
+ <stop
+ id="stop7081"
+ offset="1"
+ style="stop-color:#d2d2d2;stop-opacity:1;" />
+ </linearGradient>
+ <linearGradient
+ id="linearGradient6092">
+ <stop
+ id="stop6094"
+ offset="0"
+ style="stop-color:#ff7722;stop-opacity:1;" />
+ <stop
+ style="stop-color:#c2481a;stop-opacity:1;"
+ offset="0.5"
+ id="stop6098" />
+ <stop
+ id="stop6096"
+ offset="1"
+ style="stop-color:#af1a12;stop-opacity:1;" />
+ </linearGradient>
+ <linearGradient
+ id="linearGradient6084">
+ <stop
+ style="stop-color:#ffffff;stop-opacity:1;"
+ offset="0"
+ id="stop6086" />
+ <stop
+ style="stop-color:#ffffff;stop-opacity:0;"
+ offset="1"
+ id="stop6088" />
+ </linearGradient>
+ <linearGradient
+ id="linearGradient5101">
+ <stop
+ style="stop-color:#ffffff;stop-opacity:1;"
+ offset="0"
+ id="stop5103" />
+ <stop
+ style="stop-color:#ffffff;stop-opacity:0;"
+ offset="1"
+ id="stop5105" />
+ </linearGradient>
+ <linearGradient
+ id="linearGradient4122">
+ <stop
+ style="stop-color:#2d4a00;stop-opacity:1;"
+ offset="0"
+ id="stop4124" />
+ <stop
+ style="stop-color:#4a7f00;stop-opacity:1;"
+ offset="1"
+ id="stop4126" />
+ </linearGradient>
+ <linearGradient
+ id="linearGradient3141">
+ <stop
+ style="stop-color:#dfff00;stop-opacity:1;"
+ offset="0"
+ id="stop3143" />
+ <stop
+ id="stop3149"
+ offset="0.5"
+ style="stop-color:#b5d700;stop-opacity:1;" />
+ <stop
+ style="stop-color:#5d7f00;stop-opacity:1;"
+ offset="1"
+ id="stop3145" />
+ </linearGradient>
+ <radialGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient3141"
+ id="radialGradient3151"
+ cx="42.774372"
+ cy="21.348114"
+ fx="42.774372"
+ fy="21.348114"
+ r="22.727272"
+
gradientTransform="matrix(-5.0076187e-8,0.8656759,-1.0221204,-5.7746845e-8,54.547617,2.2138655)"
+ gradientUnits="userSpaceOnUse" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient4122"
+ id="linearGradient4128"
+ x1="32.727272"
+ y1="8.5929136"
+ x2="32.727272"
+ y2="58.917061"
+ gradientUnits="userSpaceOnUse" />
+ <radialGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient5101"
+ id="radialGradient5107"
+ cx="32.545456"
+ cy="20.427832"
+ fx="32.545456"
+ fy="20.427832"
+ r="12.181818"
+
gradientTransform="matrix(1.8507463,-6.9585484e-8,5.8877557e-8,1.3970149,-27.687927,-8.6974249)"
+ gradientUnits="userSpaceOnUse" />
+ <filter
+ inkscape:collect="always"
+ id="filter11994">
+ <feGaussianBlur
+ inkscape:collect="always"
+ stdDeviation="0.88281265"
+ id="feGaussianBlur11996" />
+ </filter>
+ <filter
+ inkscape:collect="always"
+ x="-0.10231576"
+ width="1.2046315"
+ y="-0.02314285"
+ height="1.0462857"
+ id="filter13015">
+ <feGaussianBlur
+ inkscape:collect="always"
+ stdDeviation="0.51261835"
+ id="feGaussianBlur13017" />
+ </filter>
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient3167"
+ id="linearGradient3173"
+ x1="34.782578"
+ y1="14.965515"
+ x2="35.110737"
+ y2="45.892094"
+ gradientUnits="userSpaceOnUse"
+
gradientTransform="matrix(1.0436464,0,0,1.1317127,-1.30159,-2.936664)"
/>
+ <radialGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient6086"
+ id="radialGradient6095"
+ gradientUnits="userSpaceOnUse"
+
gradientTransform="matrix(-5.0076187e-8,0.8656759,-1.0221204,-5.7746845e-8,54.547617,2.2138655)"
+ cx="19.112965"
+ cy="21.348116"
+ fx="19.112965"
+ fy="21.348116"
+ r="22.727272" />
+ <filter
+ inkscape:collect="always"
+ id="filter10966">
+ <feGaussianBlur
+ inkscape:collect="always"
+ stdDeviation="0.41033419"
+ id="feGaussianBlur10968" />
+ </filter>
+ <radialGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient5101"
+ id="radialGradient10972"
+ gradientUnits="userSpaceOnUse"
+
gradientTransform="matrix(-1.0000001,7.9445257e-3,-9.3908749e-3,-1.1054913,65.282749,42.164789)"
+ cx="32.545456"
+ cy="20.427832"
+ fx="32.545456"
+ fy="20.427832"
+ r="12.181818" />
+ <filter
+ inkscape:collect="always"
+ id="filter12936">
+ <feGaussianBlur
+ inkscape:collect="always"
+ stdDeviation="0.42987189"
+ id="feGaussianBlur12938" />
+ </filter>
+ </defs>
+ <sodipodi:namedview
+ id="base"
+ pagecolor="#ffffff"
+ bordercolor="#666666"
+ borderopacity="1.0"
+ inkscape:pageopacity="0.0"
+ inkscape:pageshadow="2"
+ inkscape:zoom="7.7781746"
+ inkscape:cx="18.700083"
+ inkscape:cy="32"
+ inkscape:current-layer="layer1"
+ showgrid="true"
+ inkscape:document-units="px"
+ inkscape:grid-bbox="true"
+ inkscape:window-width="910"
+ inkscape:window-height="705"
+ inkscape:window-x="98"
+ inkscape:window-y="128" />
+ <metadata
+ id="metadata2165">
+ <rdf:RDF>
+ <cc:Work
+ rdf:about="">
+ <dc:format>image/svg+xml</dc:format>
+ <dc:type
+ rdf:resource="http://purl.org/dc/dcmitype/StillImage"
/>
+ </cc:Work>
+ </rdf:RDF>
+ </metadata>
+ <g
+ id="layer1"
+ inkscape:label="Layer 1"
+ inkscape:groupmode="layer">
+ <path
+ transform="matrix(1.046,0,0,1.0584678,-1.7327279,-0.4406171)"
+ d="M 55.454544 31.636364 A 22.727272 22.545454 0 1 1 10,31.636364
A 22.727272 22.545454 0 1 1 55.454544 31.636364 z"
+ sodipodi:ry="22.545454"
+ sodipodi:rx="22.727272"
+ sodipodi:cy="31.636364"
+ sodipodi:cx="32.727272"
+ id="path10014"
+
style="opacity:1;fill:#000000;fill-opacity:0.49714285;stroke:none;stroke-width:1.50907874;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;filter:url(#filter11994)"
+ sodipodi:type="arc" />
+ <path
+ sodipodi:type="arc"
+
style="opacity:1;fill:url(#radialGradient3151);fill-opacity:1.0;stroke:url(#linearGradient4128);stroke-width:1.00605248;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+ id="path2168"
+ sodipodi:cx="32.727272"
+ sodipodi:cy="31.636364"
+ sodipodi:rx="22.727272"
+ sodipodi:ry="22.545454"
+ d="M 55.454544 31.636364 A 22.727272 22.545454 0 1 1 10,31.636364
A 22.727272 22.545454 0 1 1 55.454544 31.636364 z"
+ transform="matrix(0.99,0,0,0.9979839,9.9999396e-2,0.1092363)"
/>
+ <path
+
transform="matrix(0.8598924,0,0,0.9324055,4.3580679,2.2481825)"
+ d="M 55.454544 31.636364 A 22.727272 22.545454 0 1 1 10,31.636364
A 22.727272 22.545454 0 1 1 55.454544 31.636364 z"
+ sodipodi:ry="22.545454"
+ sodipodi:rx="22.727272"
+ sodipodi:cy="31.636364"
+ sodipodi:cx="32.727272"
+ id="path5115"
+
style="opacity:1;fill:url(#radialGradient6095);fill-opacity:1;stroke:none;stroke-width:1.00605249;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+ sodipodi:type="arc" />
+ <path
+ sodipodi:nodetypes="cccccccc"
+ d="M 41.698223,17.66376 C 34.450141,23.421281 32.425172,25.369268
28.779364,29.048781 C 35.586572,28.320605 45.393645,27.687509
45.675459,32.562746 C 40.891023,36.481874 24.130868,50.299522
24.130868,50.299522 C 22.734736,47.695098 29.206757,40.436088
33.191607,36.346709 C 36.442048,33.537128 25.599316,34.350701 20.121233,37.12495
C 18.949598,32.700781 26.53113,20.675733 31.609069,17.543393 L
41.698223,17.66376 z "
+ id="path9006"
+
style="opacity:1;fill:#000000;fill-opacity:0.49714284;stroke:none;stroke-width:1.08678794;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;filter:url(#filter10966)"
/>
+ <path
+
style="opacity:1;fill:url(#linearGradient3173);fill-opacity:1;stroke:#ffffff;stroke-width:1.08678794;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+ id="path2199"
+ d="M 40.93284,14.668012 C 34.164295,20.628913 32.273299,22.645711
28.868699,26.4552 C 35.225539,25.701301 44.383771,25.045842 44.64694,30.093293 C
40.179045,34.150861 24.52775,48.456606 24.52775,48.456606 C 23.223987,45.760183
29.267816,38.244754 32.989026,34.010921 C 36.024416,31.102094
25.899045,31.944406 20.783395,34.816653 C 19.689275,30.236204 26.76921,17.78638
31.51119,14.543393 L 40.93284,14.668012 z "
+ sodipodi:nodetypes="cccccccc" />
+ <path
+ sodipodi:type="arc"
+
style="opacity:0.64999999;fill:url(#radialGradient5107);fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+ id="path4130"
+ sodipodi:cx="32.545456"
+ sodipodi:cy="23.454546"
+ sodipodi:rx="12.181818"
+ sodipodi:ry="9.272727"
+ d="M 44.727274 23.454546 A 12.181818 9.272727 0 1 1
20.363638,23.454546 A 12.181818 9.272727 0 1 1 44.727274 23.454546 z"
+
transform="matrix(1.0261194,0,0,0.9558823,-0.8955235,-2.6470585)"
/>
+ <path
+
transform="matrix(1.2846883,0,0,1.2521748,-9.2464838,12.656098)"
+ d="M 44.727274 23.454546 A 12.181818 9.272727 0 1 1
20.363638,23.454546 A 12.181818 9.272727 0 1 1 44.727274 23.454546 z"
+ sodipodi:ry="9.272727"
+ sodipodi:rx="12.181818"
+ sodipodi:cy="23.454546"
+ sodipodi:cx="32.545456"
+ id="path10970"
+
style="opacity:0.33;fill:url(#radialGradient10972);fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;filter:url(#filter12936)"
+ sodipodi:type="arc" />
+ </g>
+</svg>
commit 49e4db65092e7df20184b700fe759059a8cd5221
Author: Benjamin Otte <otte at gnome.org>
Date: Fri Oct 19 19:53:30 2007 +0200
create a data/ directory
This is for static data like pkgconfig files or logos
diff --git a/.gitignore b/.gitignore
index 114670d..d58a796 100644
--- a/.gitignore
+++ b/.gitignore
@@ -19,6 +19,3 @@ libtool
ltmain.sh
missing
stamp-h1
-swfdec-*.pc
-swfdec.pc
-swfdec.spec
diff --git a/Makefile.am b/Makefile.am
index 27849d7..37b2970 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -17,6 +17,7 @@ SUBDIRS= \
libswfdec \
$(GTK_SUBDIRS) \
$(VIVI_SUBDIRS) \
+ data \
test
ACLOCAL_FLAGS = -I m4
@@ -32,21 +33,6 @@ EXTRA_DIST=depcomp \
m4/ax_create_stdint_h.m4 \
m4/gtk-doc.m4
-pkgconfigdir = $(libdir)/pkgconfig
-if WITH_GTK
-pkgconfig_DATA = swfdec- at SWFDEC_MAJORMINOR@.pc swfdec-gtk- at
SWFDEC_MAJORMINOR@.pc
-else
-pkgconfig_DATA = swfdec- at SWFDEC_MAJORMINOR@.pc
-endif
-
-CLEANFILES = swfdec-$(SWFDEC_MAJORMINOR).pc swfdec-gtk-$(SWFDEC_MAJORMINOR).pc
-
-swfdec- at SWFDEC_MAJORMINOR@.pc: swfdec.pc
- cp swfdec.pc swfdec- at SWFDEC_MAJORMINOR@.pc
-
-swfdec-gtk- at SWFDEC_MAJORMINOR@.pc: swfdec-gtk.pc
- cp swfdec-gtk.pc swfdec-gtk- at SWFDEC_MAJORMINOR@.pc
-
# build documentation when doing distcheck
DISTCHECK_CONFIGURE_FLAGS = --enable-gtk-doc
diff --git a/configure.ac b/configure.ac
index fd4e7f3..d1f728d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -317,6 +317,9 @@ dnl testsuite/autoplug/Makefile
dnl testsuite/Makefile
AC_CONFIG_FILES(
Makefile
+data/Makefile
+data/swfdec.pc
+data/swfdec-gtk.pc
doc/Makefile
libswfdec/Makefile
libswfdec/jpeg/Makefile
@@ -331,8 +334,6 @@ vivified/Makefile
vivified/core/Makefile
vivified/dock/Makefile
vivified/ui/Makefile
-swfdec.pc
-swfdec-gtk.pc
)
AC_OUTPUT
diff --git a/data/.gitignore b/data/.gitignore
new file mode 100644
index 0000000..4e9f612
--- /dev/null
+++ b/data/.gitignore
@@ -0,0 +1,3 @@
+*~
+swfdec-*.pc
+swfdec.pc
diff --git a/data/Makefile.am b/data/Makefile.am
new file mode 100644
index 0000000..6479fe5
--- /dev/null
+++ b/data/Makefile.am
@@ -0,0 +1,15 @@
+pkgconfigdir = $(libdir)/pkgconfig
+if WITH_GTK
+pkgconfig_DATA = swfdec- at SWFDEC_MAJORMINOR@.pc swfdec-gtk- at
SWFDEC_MAJORMINOR@.pc
+else
+pkgconfig_DATA = swfdec- at SWFDEC_MAJORMINOR@.pc
+endif
+
+CLEANFILES = swfdec-$(SWFDEC_MAJORMINOR).pc swfdec-gtk-$(SWFDEC_MAJORMINOR).pc
+
+swfdec- at SWFDEC_MAJORMINOR@.pc: swfdec.pc
+ cp swfdec.pc swfdec- at SWFDEC_MAJORMINOR@.pc
+
+swfdec-gtk- at SWFDEC_MAJORMINOR@.pc: swfdec-gtk.pc
+ cp swfdec-gtk.pc swfdec-gtk- at SWFDEC_MAJORMINOR@.pc
+
diff --git a/data/swfdec-gtk.pc.in b/data/swfdec-gtk.pc.in
new file mode 100644
index 0000000..39eb02e
--- /dev/null
+++ b/data/swfdec-gtk.pc.in
@@ -0,0 +1,11 @@
+prefix=@prefix@
+exec_prefix=@exec_prefix@
+libdir=@libdir@
+includedir=@includedir@/swfdec- at SWFDEC_MAJORMINOR@
+
+Name: swfdec-gtk
+Description: Support for playing Flash files in Gtk using Swfdec
+Version: @VERSION@
+Requires: swfdec- at SWFDEC_MAJORMINOR@ = @PACKAGE_VERSION@ gtk+-2.0 >=
@GTK_VER@
+Libs: -L${libdir} -lswfdec-gtk- at SWFDEC_MAJORMINOR@
+Cflags: -I${includedir}
diff --git a/data/swfdec.pc.in b/data/swfdec.pc.in
new file mode 100644
index 0000000..2e0e0d4
--- /dev/null
+++ b/data/swfdec.pc.in
@@ -0,0 +1,11 @@
+prefix=@prefix@
+exec_prefix=@exec_prefix@
+libdir=@libdir@
+includedir=@includedir@/swfdec- at SWFDEC_MAJORMINOR@
+
+Name: swfdec
+Description: Decodes and Plays Flash files
+Version: @VERSION@
+Requires: glib-2.0 >= @GLIB_VER@ gobject-2.0 >= @GLIB_VER@ liboil-0.3
cairo pangocairo
+Libs: -L${libdir} -lswfdec- at SWFDEC_MAJORMINOR@
+Cflags: -I${includedir}
diff --git a/swfdec-gtk.pc.in b/swfdec-gtk.pc.in
deleted file mode 100644
index 39eb02e..0000000
--- a/swfdec-gtk.pc.in
+++ /dev/null
@@ -1,11 +0,0 @@
-prefix=@prefix@
-exec_prefix=@exec_prefix@
-libdir=@libdir@
-includedir=@includedir@/swfdec- at SWFDEC_MAJORMINOR@
-
-Name: swfdec-gtk
-Description: Support for playing Flash files in Gtk using Swfdec
-Version: @VERSION@
-Requires: swfdec- at SWFDEC_MAJORMINOR@ = @PACKAGE_VERSION@ gtk+-2.0 >=
@GTK_VER@
-Libs: -L${libdir} -lswfdec-gtk- at SWFDEC_MAJORMINOR@
-Cflags: -I${includedir}
diff --git a/swfdec.pc.in b/swfdec.pc.in
deleted file mode 100644
index 2e0e0d4..0000000
--- a/swfdec.pc.in
+++ /dev/null
@@ -1,11 +0,0 @@
-prefix=@prefix@
-exec_prefix=@exec_prefix@
-libdir=@libdir@
-includedir=@includedir@/swfdec- at SWFDEC_MAJORMINOR@
-
-Name: swfdec
-Description: Decodes and Plays Flash files
-Version: @VERSION@
-Requires: glib-2.0 >= @GLIB_VER@ gobject-2.0 >= @GLIB_VER@ liboil-0.3
cairo pangocairo
-Libs: -L${libdir} -lswfdec- at SWFDEC_MAJORMINOR@
-Cflags: -I${includedir}
Reasonably Related Threads
- [PATCH] Update the 5 year logo to 10 year logo
- RSvgDevice incomplete svg output
- 12 commits - libswfdec/Makefile.am libswfdec/swfdec_as_strings.c libswfdec/swfdec_as_types.c libswfdec/swfdec_as_types.h libswfdec/swfdec_gradient_pattern.c libswfdec/swfdec_gradient_pattern.h libswfdec/swfdec_movie_as_drawing.c libswfdec/swfdec_pattern.c
- Re: [advocacy] Ogg & Ogg Vorbis _unofficial_ logos page.
- Re: win.metafiles in linux and R
Wisdom of the Ancients
