Author: mkestner
Date: 2007-12-07 17:20:14 -0500 (Fri, 07 Dec 2007)
New Revision: 90968
Added:
trunk/gnome-sharp/gconf/GConf.PropertyEditors/gconf-sharp-peditors-2.0.pc.in
Modified:
trunk/gnome-sharp/ChangeLog
trunk/gnome-sharp/Makefile.include
trunk/gnome-sharp/configure.in.in
trunk/gnome-sharp/gconf/GConf.PropertyEditors/
trunk/gnome-sharp/gconf/GConf.PropertyEditors/Makefile.am
trunk/gnome-sharp/gconf/GConf/gconf-sharp-2.0.pc.in
Log:
2007-12-07 Mike Kestner <[EMAIL PROTECTED]>
* Makefile.include: some refinement of the variable mangling.
* configure.in.in: expand new pc.in.
* gconf/GConf/gconf-sharp-2.0.pc.in: remove gnome-sharp Requires and
peditors.dll from the Libs: var.
* gconf/GConf.PropertyEditors/Makefile.am: install new pc.
* gconf/GConf.PropertyEditors/gconf-sharp-peditors-2.0.pc.in: expose
new pc file since this is conditional and the gconf-sharp.dll build
is not.
Modified: trunk/gnome-sharp/ChangeLog
===================================================================
--- trunk/gnome-sharp/ChangeLog 2007-12-07 22:18:46 UTC (rev 90967)
+++ trunk/gnome-sharp/ChangeLog 2007-12-07 22:20:14 UTC (rev 90968)
@@ -1,3 +1,14 @@
+2007-12-07 Mike Kestner <[EMAIL PROTECTED]>
+
+ * Makefile.include: some refinement of the variable mangling.
+ * configure.in.in: expand new pc.in.
+ * gconf/GConf/gconf-sharp-2.0.pc.in: remove gnome-sharp Requires and
+ peditors.dll from the Libs: var.
+ * gconf/GConf.PropertyEditors/Makefile.am: install new pc.
+ * gconf/GConf.PropertyEditors/gconf-sharp-peditors-2.0.pc.in: expose
+ new pc file since this is conditional and the gconf-sharp.dll build
+ is not.
+
2007-12-07 Wade Berrier <[EMAIL PROTECTED]>
* gconf/GConf/Makefile.am: Copy AssemblyInfo.cs to the current dir so
Modified: trunk/gnome-sharp/Makefile.include
===================================================================
--- trunk/gnome-sharp/Makefile.include 2007-12-07 22:18:46 UTC (rev 90967)
+++ trunk/gnome-sharp/Makefile.include 2007-12-07 22:20:14 UTC (rev 90968)
@@ -1,24 +1,24 @@
SNK = gtk-sharp.snk
-API = $(pkg)-api.xml
-RAW_API = $(pkg)-api.raw
+API = $(pkg:=-api.xml)
+RAW_API = $(pkg:=-api.raw)
-ASSEMBLY_NAME = $(pkg)-sharp
-ASSEMBLY = $(ASSEMBLY_NAME).dll
+ASSEMBLY_NAME = $(pkg:=-sharp)
+ASSEMBLY = $(ASSEMBLY_NAME:=.dll)
-TARGET = $(pkg:=-sharp.dll) $(pkg:=-sharp.dll.config) $(POLICY_ASSEMBLIES)
+TARGET = $(ASSEMBLY) $(ASSEMBLY:=.config) $(POLICY_ASSEMBLIES)
noinst_DATA = $(TARGET)
-TARGET_API = $(pkg:=-api.xml)
+TARGET_API = $(API)
gapidir = $(datadir)/gapi-2.0
gapi_DATA = $(TARGET_API)
-CLEANFILES = $(ASSEMBLY) $(ASSEMBLY).mdb $(POLICY_ASSEMBLIES) generated-stamp
generated/*.cs $(API) glue/generated.c $(SNK) AssemblyInfo.cs $(POLICY_CONFIGS)
+CLEANFILES = $(ASSEMBLY) $(ASSEMBLY:=.mdb) $(POLICY_ASSEMBLIES)
generated-stamp generated/*.cs $(API) glue/generated.c $(SNK) AssemblyInfo.cs
$(POLICY_CONFIGS)
DISTCLEANFILES = $(ASSEMBLY).config
-POLICY_ASSEMBLIES = $(addsuffix .$(ASSEMBLY), $(addprefix policy.,
$(POLICY_VERSIONS)))
-POLICY_CONFIGS = $(addsuffix .config, $(addprefix policy., $(POLICY_VERSIONS)))
+POLICY_ASSEMBLIES = $(filter %.dll, $(patsubst %, policy.%.$(ASSEMBLY),
$(POLICY_VERSIONS)))
+POLICY_CONFIGS = $(patsubst %, policy.%.config, $(POLICY_VERSIONS))
-EXTRA_DIST = $(RAW_API) $(SYMBOLS) $(ASSEMBLY).config.in $(METADATA)
$(customs) $(sources) $(add_dist)
+EXTRA_DIST = $(RAW_API) $(SYMBOLS) $(ASSEMBLY:=.config.in) $(METADATA)
$(customs) $(sources) $(add_dist)
-build_symbols = $(addprefix --symbols=$(srcdir)/, $(SYMBOLS))
+build_symbols = $(patsubst %, --symbols=$(srcdir)/%, $(SYMBOLS))
$(API): $(METADATA) $(RAW_API) $(SYMBOLS)
cp $(srcdir)/$(RAW_API) $(API)
@@ -28,8 +28,8 @@
$(GAPI_FIXUP) --api=$(API) --metadata=$(srcdir)/$(METADATA)
$(build_symbols); \
fi
-build_customs = $(addprefix $(srcdir)/, $(customs))
-api_includes = $(GTKSHARP_CFLAGS) $(addprefix -I:, $(INCLUDE_API))
+build_customs = $(patsubst %, $(srcdir)/%, $(customs))
+api_includes = $(GTKSHARP_CFLAGS) $(patsubst %, -I:%, $(INCLUDE_API))
generated-stamp: $(API) $(INCLUDE_API) $(build_customs)
rm -f generated/* && \
@@ -53,8 +53,8 @@
$(AL) -link:policy.$$i.config -out:policy.$$i.$(ASSEMBLY)
-keyfile:$(SNK); \
done
-build_sources = $(addprefix $(srcdir)/, $(sources)) AssemblyInfo.cs
-build_references = $(GTKSHARP_LIBS) $(addprefix /r:, $(references))
$(MONO_CAIRO_LIBS)
+build_sources = $(patsubst %, $(srcdir)/%, $(sources)) AssemblyInfo.cs
+build_references = $(GTKSHARP_LIBS) $(patsubst %, /r:%, $(references))
$(MONO_CAIRO_LIBS)
if PLATFORM_WIN32
GAPI_CDECL_INSERT=$(top_srcdir)/gapi-cdecl-insert --keyfile=$(SNK) $(ASSEMBLY)
Modified: trunk/gnome-sharp/configure.in.in
===================================================================
--- trunk/gnome-sharp/configure.in.in 2007-12-07 22:18:46 UTC (rev 90967)
+++ trunk/gnome-sharp/configure.in.in 2007-12-07 22:20:14 UTC (rev 90968)
@@ -265,6 +265,7 @@
gconf/GConf/gconf-sharp.dll.config
gconf/GConf/gconf-sharp-2.0.pc
gconf/GConf.PropertyEditors/Makefile
+gconf/GConf.PropertyEditors/gconf-sharp-peditors-2.0.pc
gconf/tools/Makefile
gconf/tools/gconfsharp2-schemagen
gtkhtml/Makefile
Modified: trunk/gnome-sharp/gconf/GConf/gconf-sharp-2.0.pc.in
===================================================================
--- trunk/gnome-sharp/gconf/GConf/gconf-sharp-2.0.pc.in 2007-12-07 22:18:46 UTC
(rev 90967)
+++ trunk/gnome-sharp/gconf/GConf/gconf-sharp-2.0.pc.in 2007-12-07 22:20:14 UTC
(rev 90968)
@@ -6,5 +6,4 @@
Name: GConf#
Description: GConf# - GConf .NET Binding
Version: @VERSION@
-Requires: gnome-sharp-2.0
-Libs: -r:${libdir}/mono/@PACKAGE_VERSION@/gconf-sharp.dll
-r:${libdir}/mono/@PACKAGE_VERSION@/gconf-sharp-peditors.dll
+Libs: -r:${libdir}/mono/@PACKAGE_VERSION@/gconf-sharp.dll
Property changes on: trunk/gnome-sharp/gconf/GConf.PropertyEditors
___________________________________________________________________
Name: svn:ignore
- Makefile
Makefile.in
AssemblyInfo.cs
*.dll
*.dll.mdb
gtk-sharp.snk
policy.*.config
+ Makefile
Makefile.in
AssemblyInfo.cs
*.dll
*.dll.mdb
*.pc
gtk-sharp.snk
policy.*.config
Modified: trunk/gnome-sharp/gconf/GConf.PropertyEditors/Makefile.am
===================================================================
--- trunk/gnome-sharp/gconf/GConf.PropertyEditors/Makefile.am 2007-12-07
22:18:46 UTC (rev 90967)
+++ trunk/gnome-sharp/gconf/GConf.PropertyEditors/Makefile.am 2007-12-07
22:20:14 UTC (rev 90968)
@@ -1,5 +1,7 @@
if ENABLE_GNOME
TARGET=$(ASSEMBLY)
+pkgconfigdir = $(libdir)/pkgconfig
+pkgconfig_DATA = gconf-sharp-peditors-2.0.pc
else
TARGET=
endif
@@ -8,12 +10,14 @@
ASSEMBLY_NAME = gconf-sharp-peditors
noinst_DATA = $(TARGET) $(POLICY_ASSEMBLIES)
CLEANFILES = $(ASSEMBLY) $(ASSEMBLY).mdb gtk-sharp.snk $(POLICY_ASSEMBLIES)
$(POLICY_CONFIGS)
+DISTCLEANFILES = gconf-sharp-peditors-2.0.pc
POLICY_ASSEMBLIES = $(addsuffix .$(ASSEMBLY), $(addprefix policy.,
$(POLICY_VERSIONS)))
POLICY_CONFIGS = $(addsuffix .config, $(addprefix policy., $(POLICY_VERSIONS)))
EXTRA_DIST = \
PropertyEditorColorPicker.cs \
+ gconf-sharp-peditors-2.0.pc.in \
$(sources)
references = \
Copied:
trunk/gnome-sharp/gconf/GConf.PropertyEditors/gconf-sharp-peditors-2.0.pc.in
(from rev 88033, trunk/gnome-sharp/gconf/GConf/gconf-sharp-2.0.pc.in)
===================================================================
--- trunk/gnome-sharp/gconf/GConf/gconf-sharp-2.0.pc.in 2007-10-23 20:53:27 UTC
(rev 88033)
+++
trunk/gnome-sharp/gconf/GConf.PropertyEditors/gconf-sharp-peditors-2.0.pc.in
2007-12-07 22:20:14 UTC (rev 90968)
@@ -0,0 +1,10 @@
+prefix=${pcfiledir}/../..
+exec_prefix=${prefix}
+libdir=${exec_prefix}/lib
+
+
+Name: GConf.PropertyEditors#
+Description: GConf# Property Editing classes - GConf .NET Binding
+Version: @VERSION@
+Requires: gnome-sharp-2.0 gconf-sharp-2.0
+Libs: -r:${libdir}/mono/@PACKAGE_VERSION@/gconf-sharp-peditors.dll
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches
