[Xfce4-commits] r29164 - in xfce4-mixer/branches/xfce_4_4: . lib

[Danny Milosavljevic]

Author: dannym
Date: 2009-01-11 16:53:03 +0000 (Sun, 11 Jan 2009)
New Revision: 29164

Added:
   xfce4-mixer/branches/xfce_4_4/lib/libxfce4mixer-1.0.pc.in
Modified:
   xfce4-mixer/branches/xfce_4_4/configure.in.in
   xfce4-mixer/branches/xfce_4_4/lib/Makefile.am
   xfce4-mixer/branches/xfce_4_4/lib/vc_oss.c
Log:
fix 'libxfce4mixer' header usage.

Modified: xfce4-mixer/branches/xfce_4_4/configure.in.in
===================================================================
--- xfce4-mixer/branches/xfce_4_4/configure.in.in	2009-01-11 16:29:13 UTC (rev 29163)
+++ xfce4-mixer/branches/xfce_4_4/configure.in.in	2009-01-11 16:53:03 UTC (rev 29164)
@@ -120,6 +120,7 @@
 xfce4-mixer.spec
 include/Makefile
 lib/Makefile
+lib/libxfce4mixer-1.0.pc
 src/Makefile
 panel-plugin/Makefile
 settings/Makefile

Modified: xfce4-mixer/branches/xfce_4_4/lib/Makefile.am
===================================================================
--- xfce4-mixer/branches/xfce_4_4/lib/Makefile.am	2009-01-11 16:29:13 UTC (rev 29163)
+++ xfce4-mixer/branches/xfce_4_4/lib/Makefile.am	2009-01-11 16:53:03 UTC (rev 29164)
@@ -6,8 +6,13 @@
 
 plugindir = $(libdir)/xfce4/modules
 
-plugin_LTLIBRARIES = libxfce4mixer.la
+pkgconfigdir = $(libdir)/pkgconfig
+pkgconfig_DATA = libxfce4mixer-1.0.pc
 
+lib_LTLIBRARIES = libxfce4mixer.la                                          
+                                                                                                                                                        
+#plugin_LTLIBRARIES = libxfce4mixer.la
+
 libxfce4mixer_la_SOURCES = trans.c vc_alsa.c vc_alsa_fallback.c vc.c vc_oss.c vcs.c vc_sun.c vc_sgi.c stringlist.inc
 
 libxfce4mixer_la_LDFLAGS = -export-dynamic
@@ -18,3 +23,8 @@
 test_vc_CFLAGS = @GTK_CFLAGS@ @XFCE4_UTIL_CFLAGS@
 test_vc_LDFLAGS = @GTK_LIBS@ @XFCE4_UTIL_LIBS@ libxfce4mixer.la
 noinst_PROGRAMS = test_vc
+
+xfce4_mixerincludedir = $(includedir)/xfce4/libxfce4mixer
+
+xfce4_mixerinclude_HEADERS = ../include/vc.h
+

Added: xfce4-mixer/branches/xfce_4_4/lib/libxfce4mixer-1.0.pc.in
===================================================================
--- xfce4-mixer/branches/xfce_4_4/lib/libxfce4mixer-1.0.pc.in	                        (rev 0)
+++ xfce4-mixer/branches/xfce_4_4/lib/libxfce4mixer-1.0.pc.in	2009-01-11 16:53:03 UTC (rev 29164)
@@ -0,0 +1,14 @@
+prefix=@prefix@
+datadir=@datadir@
+exec_prefix=@exec_prefix@
+libdir=@libdir@
+libexecdir=@libexecdir@
+includedir=@includedir@
+localedir=@localedir@
+
+Name: libxfce4mixer
+Description: Library for the Xfce Mixer
+Requires: glib-2.0
+Version: @VERSION@
+Libs: -L${libdir} -lxfce4mixer
+Cflags: -I${includedir}/xfce4/

Modified: xfce4-mixer/branches/xfce_4_4/lib/vc_oss.c
===================================================================
--- xfce4-mixer/branches/xfce_4_4/lib/vc_oss.c	2009-01-11 16:29:13 UTC (rev 29163)
+++ xfce4-mixer/branches/xfce_4_4/lib/vc_oss.c	2009-01-11 16:53:03 UTC (rev 29164)
@@ -69,8 +69,6 @@
 
 #include <glib.h>
 
-#include <libxfce4util/libxfce4util.h>
-
 #define VC_PLUGIN
 #include "vc.h"