2007-08-05 Miguel de Icaza <miguel@novell.com>

	* data/Makefile.am (pkgconfig_DATA): Move the pc.in files to the
	data directory to keep the toplevel directory clean.

svn path=/trunk/mono/; revision=83507

diff --git a/Makefile.am b/Makefile.am
index 38ef8d8ea272cd06cfd0b5215e8152e819bcf7b0..12af7d609bc94bdbd6019e72e12a830f269360d2 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -7,7 +7,7 @@ SUBDIRS = $(libgc_dir) mono $(ikvm_native_dir) support docs data runtime scripts
 ## 'tools' is not normally built
 DIST_SUBDIRS = libgc mono ikvm-native support docs data runtime scripts man samples web tools msvc
 
-EXTRA_DIST= mono.pc.in mint.pc.in mono-uninstalled.pc.in dotnet.pc.in mono-cairo.pc.in cecil.pc.in LICENSE
+EXTRA_DIST= mono-uninstalled.pc.in LICENSE
 
 DISTCHECK_CONFIGURE_FLAGS = EXTERNAL_MCS=false EXTERNAL_RUNTIME=false
 
@@ -17,17 +17,8 @@ dist-hook:
        d=`cd $(distdir)/mcs && pwd`; cd $(mcs_topdir) && $(MAKE) PROFILE=default distdir=$$d dist-recursive
 
 pkgconfigdir = $(libdir)/pkgconfig
-if JIT_SUPPORTED
-if INTERP_SUPPORTED
-pkgconfig_DATA= mono.pc mint.pc dotnet.pc mono-cairo.pc cecil.pc
-else
-pkgconfig_DATA= mono.pc dotnet.pc mono-cairo.pc cecil.pc
-endif
-else
-pkgconfig_DATA= mint.pc mono-cairo.pc cecil.pc
-endif
 noinst_DATA = mono-uninstalled.pc
-DISTCLEANFILES= mono.pc mint.pc mono-uninstalled.pc dotnet.pc mono-cairo.pc cecil.pc
+DISTCLEANFILES= mono-uninstalled.pc
 
 .PHONY: get-monolite-latest mcs-do-compiler-tests compiler-tests bootstrap-world
 

diff --git a/cecil.pc.in b/cecil.pc.in
deleted file mode 100644 (file)
index 0e4cf5e..0000000
--- a/cecil.pc.in
+++ /dev/null
@@ -1,7 +0,0 @@
-assemblies_dir=@prefix@/lib/mono
-Libraries=${assemblies_dir}/gac/Mono.Cecil/0.5.0.1__0738eb9f132ed756/Mono.Cecil.dll
-
-Name: Mono Internal -- Do not use.
-Description: Mono Internal Libraries -- Do not use 
-Version: @VERSION@
-Libs: -r:Mono.Cecil.dll

diff --git a/configure.in b/configure.in
index a9e8e761b8770f8422ba64b5ac29b8131a873c47..838fbf8edcd5a0ab33f19767c00cdc151dba1a14 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -2051,11 +2051,6 @@ AC_CONFIG_COMMANDS([runtime/etc/mono/browscap.ini],
 
 AC_OUTPUT([
 Makefile
-mint.pc
-mono.pc
-mono-cairo.pc
-dotnet.pc
-cecil.pc
 mono-uninstalled.pc
 scripts/mono-nunit.pc
 scripts/mono-find-provides
@@ -2101,6 +2096,11 @@ docs/Makefile
 data/Makefile
 data/net_1_1/Makefile
 data/net_2_0/Makefile
+data/mint.pc
+data/mono.pc
+data/mono-cairo.pc
+data/dotnet.pc
+data/cecil.pc
 samples/Makefile
 support/Makefile
 data/config

diff --git a/data/Makefile.am b/data/Makefile.am
index d80780ee0f2d99d637d4dcfd59f4925f74912e95..d4eb32a3d51938d25ce0466e130e51e685e75060 100644 (file)
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -2,8 +2,24 @@ SUBDIRS = net_1_1 net_2_0
 
 monodir = $(sysconfdir)/mono
 
-EXTRA_DIST =  config.in \
-            browscap.ini mono.supp README
+EXTRA_DIST =   \
+       config.in \
+       browscap.ini mono.supp README \
+       mono.pc.in mint.pc.in dotnet.pc.in mono-cairo.pc.in cecil.pc.in
+
+pkgconfigdir = $(libdir)/pkgconfig
+
+if JIT_SUPPORTED
+if INTERP_SUPPORTED
+pkgconfig_DATA= mono.pc mint.pc dotnet.pc mono-cairo.pc cecil.pc
+else
+pkgconfig_DATA= mono.pc dotnet.pc mono-cairo.pc cecil.pc
+endif
+else
+pkgconfig_DATA= mint.pc mono-cairo.pc cecil.pc
+endif
+
+DISTCLEANFILES= mono.pc mint.pc dotnet.pc mono-cairo.pc cecil.pc
 
 mono_DATA =  config \
             browscap.ini

diff --git a/data/cecil.pc.in b/data/cecil.pc.in
new file mode 100644 (file)
index 0000000..0e4cf5e
--- /dev/null
+++ b/data/cecil.pc.in
@@ -0,0 +1,7 @@
+assemblies_dir=@prefix@/lib/mono
+Libraries=${assemblies_dir}/gac/Mono.Cecil/0.5.0.1__0738eb9f132ed756/Mono.Cecil.dll
+
+Name: Mono Internal -- Do not use.
+Description: Mono Internal Libraries -- Do not use 
+Version: @VERSION@
+Libs: -r:Mono.Cecil.dll

diff --git a/data/dotnet.pc.in b/data/dotnet.pc.in
new file mode 100644 (file)
index 0000000..e9b2b76
--- /dev/null
+++ b/data/dotnet.pc.in
@@ -0,0 +1,5 @@
+
+Name: Standard libraries in a .NET setup
+Description: References all the standard .NET libraries for compilation
+Version: @VERSION@
+Libs: -r:Accessibility.dll -r:cscompmgd.dll -r:Microsoft.JScript.dll -r:Microsoft.VisualC.dll -r:Microsoft.Vsa.dll -r:System.Configuration.Install.dll -r:System.Data.dll -r:System.Data.OracleClient.dll -r:System.Design.dll -r:System.DirectoryServices.dll -r:System.dll -r:System.Drawing.Design.dll -r:System.Drawing.dll -r:System.EnterpriseServices.dll -r:System.Management.dll -r:System.Messaging.dll -r:System.Runtime.Remoting.dll -r:System.Runtime.Serialization.Formatters.Soap.dll -r:System.Security.dll -r:System.ServiceProcess.dll -r:System.Web.dll -r:System.Web.Services.dll -r:System.Windows.Forms.dll -r:System.Xml.dll

diff --git a/data/mint.pc.in b/data/mint.pc.in
new file mode 100644 (file)
index 0000000..0b91a2c
--- /dev/null
+++ b/data/mint.pc.in
@@ -0,0 +1,12 @@
+prefix=${pcfiledir}/../..
+exec_prefix=${pcfiledir}/../..
+libdir=${prefix}/lib
+includedir=${prefix}/include/mono-@API_VER@
+
+
+Name: Mono Interpreter
+Description: Mono Interpreter Runtime
+Version: @VERSION@
+Requires: glib-2.0 gthread-2.0
+Libs: -L${libdir} @export_ldflags@ -lmint @libmono_ldflags@
+Cflags: -I${includedir} @libmono_cflags@

diff --git a/data/mono-cairo.pc.in b/data/mono-cairo.pc.in
new file mode 100644 (file)
index 0000000..2a5c07f
--- /dev/null
+++ b/data/mono-cairo.pc.in
@@ -0,0 +1,9 @@
+prefix=${pcfiledir}/../..
+exec_prefix=${pcfiledir}/../..
+libdir=${prefix}/@reloc_libdir@
+includedir=${prefix}/include
+
+Name: Mono.Cairo
+Description: Cairo bindings for Mono
+Version: @VERSION@
+Libs: -r:${prefix}/lib/mono/1.0/Mono.Cairo.dll

diff --git a/data/mono.pc.in b/data/mono.pc.in
new file mode 100644 (file)
index 0000000..9374c19
--- /dev/null
+++ b/data/mono.pc.in
@@ -0,0 +1,11 @@
+prefix=${pcfiledir}/../..
+exec_prefix=${pcfiledir}/../..
+libdir=${prefix}/@reloc_libdir@
+includedir=${prefix}/include/mono-@API_VER@
+
+Name: Mono
+Description: Mono Runtime
+Version: @VERSION@
+Requires: glib-2.0 gthread-2.0
+Libs: -L${libdir} @export_ldflags@ -lmono @libmono_ldflags@
+Cflags: -I${includedir} @libmono_cflags@

diff --git a/dotnet.pc.in b/dotnet.pc.in
deleted file mode 100644 (file)
index e9b2b76..0000000
--- a/dotnet.pc.in
+++ /dev/null
@@ -1,5 +0,0 @@
-
-Name: Standard libraries in a .NET setup
-Description: References all the standard .NET libraries for compilation
-Version: @VERSION@
-Libs: -r:Accessibility.dll -r:cscompmgd.dll -r:Microsoft.JScript.dll -r:Microsoft.VisualC.dll -r:Microsoft.Vsa.dll -r:System.Configuration.Install.dll -r:System.Data.dll -r:System.Data.OracleClient.dll -r:System.Design.dll -r:System.DirectoryServices.dll -r:System.dll -r:System.Drawing.Design.dll -r:System.Drawing.dll -r:System.EnterpriseServices.dll -r:System.Management.dll -r:System.Messaging.dll -r:System.Runtime.Remoting.dll -r:System.Runtime.Serialization.Formatters.Soap.dll -r:System.Security.dll -r:System.ServiceProcess.dll -r:System.Web.dll -r:System.Web.Services.dll -r:System.Windows.Forms.dll -r:System.Xml.dll

diff --git a/mint.pc.in b/mint.pc.in
deleted file mode 100644 (file)
index 0b91a2c..0000000
--- a/mint.pc.in
+++ /dev/null
@@ -1,12 +0,0 @@
-prefix=${pcfiledir}/../..
-exec_prefix=${pcfiledir}/../..
-libdir=${prefix}/lib
-includedir=${prefix}/include/mono-@API_VER@
-
-
-Name: Mono Interpreter
-Description: Mono Interpreter Runtime
-Version: @VERSION@
-Requires: glib-2.0 gthread-2.0
-Libs: -L${libdir} @export_ldflags@ -lmint @libmono_ldflags@
-Cflags: -I${includedir} @libmono_cflags@

diff --git a/mono-cairo.pc.in b/mono-cairo.pc.in
deleted file mode 100644 (file)
index 2a5c07f..0000000
--- a/mono-cairo.pc.in
+++ /dev/null
@@ -1,9 +0,0 @@
-prefix=${pcfiledir}/../..
-exec_prefix=${pcfiledir}/../..
-libdir=${prefix}/@reloc_libdir@
-includedir=${prefix}/include
-
-Name: Mono.Cairo
-Description: Cairo bindings for Mono
-Version: @VERSION@
-Libs: -r:${prefix}/lib/mono/1.0/Mono.Cairo.dll

diff --git a/mono.pc.in b/mono.pc.in
deleted file mode 100644 (file)
index 9374c19..0000000
--- a/mono.pc.in
+++ /dev/null
@@ -1,11 +0,0 @@
-prefix=${pcfiledir}/../..
-exec_prefix=${pcfiledir}/../..
-libdir=${prefix}/@reloc_libdir@
-includedir=${prefix}/include/mono-@API_VER@
-
-Name: Mono
-Description: Mono Runtime
-Version: @VERSION@
-Requires: glib-2.0 gthread-2.0
-Libs: -L${libdir} @export_ldflags@ -lmono @libmono_ldflags@
-Cflags: -I${includedir} @libmono_cflags@