diff --git a/ChangeLog b/ChangeLog index b8ec35c82..ea076347e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2004-04-30 Mike Kestner + + * configure.in : lookup gacutil and error out if not found. + * */Makefile.am : add install-data-local and uninstall-local targets + for GAC installation. Add gtk-sharp.pub target to cp the key in for + distcheck. + * */AssemblyInfo.cs.in : remove ../ from key path for VPATH build. + 2004-04-30 Mike Kestner * configure.in : remove BASE_DEPENDENCIES LIBS and CFLAGS and diff --git a/art/AssemblyInfo.cs.in b/art/AssemblyInfo.cs.in index c58080fcc..5d7fb4668 100644 --- a/art/AssemblyInfo.cs.in +++ b/art/AssemblyInfo.cs.in @@ -3,4 +3,4 @@ using System.Runtime.CompilerServices; [assembly:AssemblyVersion("@API_VERSION@")] [assembly:AssemblyDelaySign(true)] -[assembly:AssemblyKeyFile("../gtk-sharp.pub")] +[assembly:AssemblyKeyFile("gtk-sharp.pub")] diff --git a/art/Makefile.am b/art/Makefile.am index 7e0dfe61e..1323d9267 100644 --- a/art/Makefile.am +++ b/art/Makefile.am @@ -16,11 +16,10 @@ ASSEMBLY_NAME = art-sharp references = /r:../glib/glib-sharp.dll /r:../pango/pango-sharp.dll /r:../atk/atk-sharp.dll /r:../gdk/gdk-sharp.dll ASSEMBLY = $(ASSEMBLY_NAME).dll -assemblydir = $(libdir) apidir = $(datadir)/gapi -assembly_DATA = $(TARGET) +noinst_DATA = $(TARGET) api_DATA = $(APIS) -CLEANFILES = $(ASSEMBLY) generated-stamp generated/*.cs $(API) +CLEANFILES = $(ASSEMBLY) generated-stamp generated/*.cs $(API) gtk-sharp.pub DISTCLEANFILES = art-sharp.pc $(ASSEMBLY).config AssemblyInfo.cs @@ -54,6 +53,21 @@ generated-stamp: $(API) $(srcdir)/$(ADDITIONAL_API) ../generator/gapi_codegen.ex --include $(INCLUDE_API) --outdir=generated --customdir=$(srcdir) --assembly-name=$(ASSEMBLY_NAME) \ && touch generated-stamp -$(ASSEMBLY): $(build_sources) generated-stamp +gtk-sharp.pub: $(top_srcdir)/gtk-sharp.pub + cp $(top_srcdir)/gtk-sharp.pub . + +$(ASSEMBLY): $(build_sources) generated-stamp gtk-sharp.pub $(CSC) --unsafe /out:$(ASSEMBLY) /target:library $(references) $(build_sources) generated/*.cs +install-data-local: + @if test -n '$(TARGET)'; then \ + echo "$(GACUTIL) /i $(ASSEMBLY) /f /root $(DESTDIR)$(libdir)"; \ + $(GACUTIL) /i $(ASSEMBLY) /f /root $(DESTDIR)$(libdir) || exit 1; \ + fi + +uninstall-local: + @if test -n '$(TARGET)'; then \ + echo "$(GACUTIL) /u $(ASSEMBLY_NAME) /root $(DESTDIR)$(libdir)"; \ + $(GACUTIL) /u $(ASSEMBLY_NAME) /root $(DESTDIR)$(libdir) || exit 1; \ + fi + diff --git a/atk/AssemblyInfo.cs.in b/atk/AssemblyInfo.cs.in index c58080fcc..5d7fb4668 100644 --- a/atk/AssemblyInfo.cs.in +++ b/atk/AssemblyInfo.cs.in @@ -3,4 +3,4 @@ using System.Runtime.CompilerServices; [assembly:AssemblyVersion("@API_VERSION@")] [assembly:AssemblyDelaySign(true)] -[assembly:AssemblyKeyFile("../gtk-sharp.pub")] +[assembly:AssemblyKeyFile("gtk-sharp.pub")] diff --git a/atk/Makefile.am b/atk/Makefile.am index 0920f1e61..d1bb0e38f 100644 --- a/atk/Makefile.am +++ b/atk/Makefile.am @@ -7,11 +7,10 @@ ASSEMBLY_NAME = atk-sharp references = /r:../glib/glib-sharp.dll ASSEMBLY = $(ASSEMBLY_NAME).dll -assemblydir = $(libdir) gapidir = $(datadir)/gapi -assembly_DATA = $(ASSEMBLY) $(ASSEMBLY).config +noinst_DATA = $(ASSEMBLY) $(ASSEMBLY).config gapi_DATA = $(API) -CLEANFILES = $(ASSEMBLY) generated-stamp generated/*.cs $(API) glue/generated.c +CLEANFILES = $(ASSEMBLY) generated-stamp generated/*.cs $(API) glue/generated.c gtk-sharp.pub DISTCLEANFILES = $(ASSEMBLY).config AssemblyInfo.cs sources = @@ -42,6 +41,17 @@ generated-stamp: $(API) ../generator/gapi_codegen.exe $(build_customs) --gluelib-name=atksharpglue --glue-filename=glue/generated.c \ && touch generated-stamp -$(ASSEMBLY): $(build_sources) generated-stamp +gtk-sharp.pub: $(top_srcdir)/gtk-sharp.pub + cp $(top_srcdir)/gtk-sharp.pub . + +$(ASSEMBLY): $(build_sources) generated-stamp gtk-sharp.pub $(CSC) --unsafe /out:$(ASSEMBLY) /target:library $(references) $(build_sources) generated/*.cs +install-data-local: + echo "$(GACUTIL) /i $(ASSEMBLY) /f /root $(DESTDIR)$(libdir)"; \ + $(GACUTIL) /i $(ASSEMBLY) /f /root $(DESTDIR)$(libdir) || exit 1; + +uninstall-local: + echo "$(GACUTIL) /u $(ASSEMBLY_NAME) /root $(DESTDIR)$(libdir)"; \ + $(GACUTIL) /u $(ASSEMBLY_NAME) /root $(DESTDIR)$(libdir) || exit 1; + diff --git a/configure.in b/configure.in index 3097aa2a3..f315317a9 100644 --- a/configure.in +++ b/configure.in @@ -89,8 +89,14 @@ if test "x$CSC" = "xno" ; then AC_MSG_ERROR([No $CS compiler found]) fi +AC_PATH_PROG(GACUTIL, gacutil, no) +if test "x$GACUTIL" = "xno" ; then + AC_MSG_ERROR([No gacutil tool found]) +fi + AC_SUBST(RUNTIME) AC_SUBST(CSC) +AC_SUBST(GACUTIL) AC_SUBST(LIB_PREFIX) AC_SUBST(LIB_SUFFIX) diff --git a/gconf/GConf.PropertyEditors/AssemblyInfo.cs.in b/gconf/GConf.PropertyEditors/AssemblyInfo.cs.in index a26d20c36..5d7fb4668 100644 --- a/gconf/GConf.PropertyEditors/AssemblyInfo.cs.in +++ b/gconf/GConf.PropertyEditors/AssemblyInfo.cs.in @@ -3,4 +3,4 @@ using System.Runtime.CompilerServices; [assembly:AssemblyVersion("@API_VERSION@")] [assembly:AssemblyDelaySign(true)] -[assembly:AssemblyKeyFile("../../gtk-sharp.pub")] +[assembly:AssemblyKeyFile("gtk-sharp.pub")] diff --git a/gconf/GConf.PropertyEditors/Makefile.am b/gconf/GConf.PropertyEditors/Makefile.am index 01e99fbf6..6461eabdc 100644 --- a/gconf/GConf.PropertyEditors/Makefile.am +++ b/gconf/GConf.PropertyEditors/Makefile.am @@ -4,10 +4,10 @@ else TARGET= endif -ASSEMBLY = gconf-sharp-peditors.dll -assemblydir = $(libdir) -assembly_DATA = $(TARGET) -CLEANFILES = $(ASSEMBLY) +ASSEMBLY = $(ASSEMBLY_NAME).dll +ASSEMBLY_NAME = gconf-sharp-peditors +noinst_DATA = $(TARGET) +CLEANFILES = $(ASSEMBLY) gtk-sharp.pub DISTCLEANFILES = AssemblyInfo.cs EXTRA_DIST = \ @@ -32,6 +32,21 @@ sources = \ build_sources = $(addprefix $(srcdir)/, $(sources)) AssemblyInfo.cs -$(ASSEMBLY): $(build_sources) +gtk-sharp.pub: $(top_srcdir)/gtk-sharp.pub + cp $(top_srcdir)/gtk-sharp.pub . + +$(ASSEMBLY): $(build_sources) gtk-sharp.pub $(CSC) /out:$(ASSEMBLY) /target:library $(references) $(build_sources) +install-data-local: + @if test -n '$(TARGET)'; then \ + echo "$(GACUTIL) /i $(ASSEMBLY) /f /root $(DESTDIR)$(libdir)"; \ + $(GACUTIL) /i $(ASSEMBLY) /f /root $(DESTDIR)$(libdir) || exit 1; \ + fi + +uninstall-local: + @if test -n '$(TARGET)'; then \ + echo "$(GACUTIL) /u $(ASSEMBLY_NAME) /root $(DESTDIR)$(libdir)"; \ + $(GACUTIL) /u $(ASSEMBLY_NAME) /root $(DESTDIR)$(libdir) || exit 1; \ + fi + diff --git a/gconf/GConf/AssemblyInfo.cs.in b/gconf/GConf/AssemblyInfo.cs.in index a26d20c36..5d7fb4668 100644 --- a/gconf/GConf/AssemblyInfo.cs.in +++ b/gconf/GConf/AssemblyInfo.cs.in @@ -3,4 +3,4 @@ using System.Runtime.CompilerServices; [assembly:AssemblyVersion("@API_VERSION@")] [assembly:AssemblyDelaySign(true)] -[assembly:AssemblyKeyFile("../../gtk-sharp.pub")] +[assembly:AssemblyKeyFile("gtk-sharp.pub")] diff --git a/gconf/GConf/Makefile.am b/gconf/GConf/Makefile.am index 1903aa508..f923b6f37 100644 --- a/gconf/GConf/Makefile.am +++ b/gconf/GConf/Makefile.am @@ -1,18 +1,17 @@ if ENABLE_GNOME -ASSEMBLY = gconf-sharp.dll -TARGETS = $(ASSEMBLY) $(ASSEMBLY).config +TARGET = $(ASSEMBLY) $(ASSEMBLY).config pkgconfigdir = $(libdir)/pkgconfig pkgconfig_DATA = gconf-sharp.pc else -ASSEMBLY = -TARGETS = +TARGET = endif -assemblydir = $(libdir) -assembly_DATA = $(TARGETS) -CLEANFILES = $(ASSEMBLY) - +noinst_DATA = $(TARGET) +CLEANFILES = $(ASSEMBLY) gtk-sharp.pub DISTCLEANFILES = gconf-sharp.pc $(ASSEMBLY).config AssemblyInfo.cs +ASSEMBLY = $(ASSEMBLY_NAME).dll +ASSEMBLY_NAME = gconf-sharp + EXTRA_DIST = \ $(sources) \ $(ASSEMBLY).config.in \ @@ -35,6 +34,21 @@ sources = \ build_sources = $(addprefix $(srcdir)/, $(sources)) AssemblyInfo.cs -$(ASSEMBLY): $(build_sources) +gtk-sharp.pub: $(top_srcdir)/gtk-sharp.pub + cp $(top_srcdir)/gtk-sharp.pub . + +$(ASSEMBLY): $(build_sources) gtk-sharp.pub $(CSC) /out:$(ASSEMBLY) /target:library $(references) $(build_sources) +install-data-local: + @if test -n '$(TARGET)'; then \ + echo "$(GACUTIL) /i $(ASSEMBLY) /f /root $(DESTDIR)$(libdir)"; \ + $(GACUTIL) /i $(ASSEMBLY) /f /root $(DESTDIR)$(libdir) || exit 1; \ + fi + +uninstall-local: + @if test -n '$(TARGET)'; then \ + echo "$(GACUTIL) /u $(ASSEMBLY_NAME) /root $(DESTDIR)$(libdir)"; \ + $(GACUTIL) /u $(ASSEMBLY_NAME) /root $(DESTDIR)$(libdir) || exit 1; \ + fi + diff --git a/gda/AssemblyInfo.cs.in b/gda/AssemblyInfo.cs.in index c58080fcc..5d7fb4668 100644 --- a/gda/AssemblyInfo.cs.in +++ b/gda/AssemblyInfo.cs.in @@ -3,4 +3,4 @@ using System.Runtime.CompilerServices; [assembly:AssemblyVersion("@API_VERSION@")] [assembly:AssemblyDelaySign(true)] -[assembly:AssemblyKeyFile("../gtk-sharp.pub")] +[assembly:AssemblyKeyFile("gtk-sharp.pub")] diff --git a/gda/Makefile.am b/gda/Makefile.am index 04d582d86..5ee6b02a6 100644 --- a/gda/Makefile.am +++ b/gda/Makefile.am @@ -15,11 +15,10 @@ ASSEMBLY_NAME = gda-sharp references = /r:../glib/glib-sharp.dll ASSEMBLY = $(ASSEMBLY_NAME).dll -assemblydir = $(libdir) gapidir = $(datadir)/gapi -assembly_DATA = $(TARGET) +noinst_DATA = $(TARGET) gapi_DATA = $(APIS) -CLEANFILES = $(ASSEMBLY) generated-stamp generated/*.cs $(API) +CLEANFILES = $(ASSEMBLY) generated-stamp generated/*.cs $(API) gtk-sharp.pub DISTCLEANFILES = gda-sharp.pc $(ASSEMBLY).config AssemblyInfo.cs @@ -51,6 +50,21 @@ generated-stamp: $(API) ../generator/gapi_codegen.exe $(build_customs) --outdir=generated --customdir=$(srcdir) --assembly-name=$(ASSEMBLY_NAME) \ && touch generated-stamp -$(ASSEMBLY): $(build_sources) generated-stamp +gtk-sharp.pub: $(top_srcdir)/gtk-sharp.pub + cp $(top_srcdir)/gtk-sharp.pub . + +$(ASSEMBLY): $(build_sources) generated-stamp gtk-sharp.pub $(CSC) --unsafe /out:$(ASSEMBLY) /target:library $(references) $(build_sources) generated/*.cs +install-data-local: + @if test -n '$(TARGET)'; then \ + echo "$(GACUTIL) /i $(ASSEMBLY) /f /root $(DESTDIR)$(libdir)"; \ + $(GACUTIL) /i $(ASSEMBLY) /f /root $(DESTDIR)$(libdir) || exit 1; \ + fi + +uninstall-local: + @if test -n '$(TARGET)'; then \ + echo "$(GACUTIL) /u $(ASSEMBLY_NAME) /root $(DESTDIR)$(libdir)"; \ + $(GACUTIL) /u $(ASSEMBLY_NAME) /root $(DESTDIR)$(libdir) || exit 1; \ + fi + diff --git a/gdk/AssemblyInfo.cs.in b/gdk/AssemblyInfo.cs.in index c58080fcc..5d7fb4668 100644 --- a/gdk/AssemblyInfo.cs.in +++ b/gdk/AssemblyInfo.cs.in @@ -3,4 +3,4 @@ using System.Runtime.CompilerServices; [assembly:AssemblyVersion("@API_VERSION@")] [assembly:AssemblyDelaySign(true)] -[assembly:AssemblyKeyFile("../gtk-sharp.pub")] +[assembly:AssemblyKeyFile("gtk-sharp.pub")] diff --git a/gdk/Makefile.am b/gdk/Makefile.am index ef3210205..27de8840f 100644 --- a/gdk/Makefile.am +++ b/gdk/Makefile.am @@ -9,11 +9,10 @@ ASSEMBLY_NAME = gdk-sharp references = /r:../glib/glib-sharp.dll /r:../pango/pango-sharp.dll ASSEMBLY = $(ASSEMBLY_NAME).dll -assemblydir = $(libdir) gapidir = $(datadir)/gapi -assembly_DATA = $(ASSEMBLY) $(ASSEMBLY).config +noinst_DATA = $(ASSEMBLY) $(ASSEMBLY).config gapi_DATA = $(API) $(ADDITIONAL_API) -CLEANFILES = $(ASSEMBLY) generated-stamp generated/*.cs $(API) glue/generated.c +CLEANFILES = $(ASSEMBLY) generated-stamp generated/*.cs $(API) glue/generated.c gtk-sharp.pub DISTCLEANFILES = $(ASSEMBLY).config AssemblyInfo.cs sources = \ @@ -80,6 +79,17 @@ generated-stamp: $(API) $(srcdir)/$(ADDITIONAL_API) ../generator/gapi_codegen.ex --gluelib-name=gdksharpglue --glue-filename=glue/generated.c \ && touch generated-stamp -$(ASSEMBLY): $(build_sources) generated-stamp +gtk-sharp.pub: $(top_srcdir)/gtk-sharp.pub + cp $(top_srcdir)/gtk-sharp.pub . + +$(ASSEMBLY): $(build_sources) generated-stamp gtk-sharp.pub $(CSC) --unsafe /out:$(ASSEMBLY) /target:library $(references) $(build_sources) generated/*.cs +install-data-local: + echo "$(GACUTIL) /i $(ASSEMBLY) /f /root $(DESTDIR)$(libdir)"; \ + $(GACUTIL) /i $(ASSEMBLY) /f /root $(DESTDIR)$(libdir) || exit 1; + +uninstall-local: + echo "$(GACUTIL) /u $(ASSEMBLY_NAME) /root $(DESTDIR)$(libdir)"; \ + $(GACUTIL) /u $(ASSEMBLY_NAME) /root $(DESTDIR)$(libdir) || exit 1; + diff --git a/glade/AssemblyInfo.cs.in b/glade/AssemblyInfo.cs.in index c58080fcc..5d7fb4668 100644 --- a/glade/AssemblyInfo.cs.in +++ b/glade/AssemblyInfo.cs.in @@ -3,4 +3,4 @@ using System.Runtime.CompilerServices; [assembly:AssemblyVersion("@API_VERSION@")] [assembly:AssemblyDelaySign(true)] -[assembly:AssemblyKeyFile("../gtk-sharp.pub")] +[assembly:AssemblyKeyFile("gtk-sharp.pub")] diff --git a/glade/Makefile.am b/glade/Makefile.am index 27c59053c..bcfcf5b58 100644 --- a/glade/Makefile.am +++ b/glade/Makefile.am @@ -18,11 +18,10 @@ ASSEMBLY_NAME = glade-sharp references = /r:../glib/glib-sharp.dll /r:../pango/pango-sharp.dll /r:../atk/atk-sharp.dll /r:../gdk/gdk-sharp.dll /r:../gtk/gtk-sharp.dll ASSEMBLY = $(ASSEMBLY_NAME).dll -assemblydir = $(libdir) gapidir = $(datadir)/gapi -assembly_DATA = $(TARGET) +noinst_DATA = $(TARGET) gapi_DATA = $(APIS) -CLEANFILES = $(ASSEMBLY) generated-stamp generated/*.cs $(API) +CLEANFILES = $(ASSEMBLY) generated-stamp generated/*.cs $(API) gtk-sharp.pub DISTCLEANFILES = glade-sharp.pc $(ASSEMBLY).config AssemblyInfo.cs @@ -57,6 +56,21 @@ generated-stamp: $(API) ../generator/gapi_codegen.exe $(build_customs) --include $(INCLUDE_API) --outdir=generated --customdir=$(srcdir) --assembly-name=$(ASSEMBLY_NAME) \ && touch generated-stamp -$(ASSEMBLY): $(build_sources) generated-stamp +gtk-sharp.pub: $(top_srcdir)/gtk-sharp.pub + cp $(top_srcdir)/gtk-sharp.pub . + +$(ASSEMBLY): $(build_sources) generated-stamp gtk-sharp.pub $(CSC) --unsafe /out:$(ASSEMBLY) /target:library $(references) $(build_sources) generated/*.cs +install-data-local: + @if test -n '$(TARGET)'; then \ + echo "$(GACUTIL) /i $(ASSEMBLY) /f /root $(DESTDIR)$(libdir)"; \ + $(GACUTIL) /i $(ASSEMBLY) /f /root $(DESTDIR)$(libdir) || exit 1; \ + fi + +uninstall-local: + @if test -n '$(TARGET)'; then \ + echo "$(GACUTIL) /u $(ASSEMBLY_NAME) /root $(DESTDIR)$(libdir)"; \ + $(GACUTIL) /u $(ASSEMBLY_NAME) /root $(DESTDIR)$(libdir) || exit 1; \ + fi + diff --git a/glib/AssemblyInfo.cs.in b/glib/AssemblyInfo.cs.in index c58080fcc..5d7fb4668 100644 --- a/glib/AssemblyInfo.cs.in +++ b/glib/AssemblyInfo.cs.in @@ -3,4 +3,4 @@ using System.Runtime.CompilerServices; [assembly:AssemblyVersion("@API_VERSION@")] [assembly:AssemblyDelaySign(true)] -[assembly:AssemblyKeyFile("../gtk-sharp.pub")] +[assembly:AssemblyKeyFile("gtk-sharp.pub")] diff --git a/glib/Makefile.am b/glib/Makefile.am index f0acfb329..f2cd75eb7 100644 --- a/glib/Makefile.am +++ b/glib/Makefile.am @@ -1,9 +1,9 @@ SUBDIRS = glue -ASSEMBLY = glib-sharp.dll -assemblydir = $(libdir) -assembly_DATA = $(ASSEMBLY) $(ASSEMBLY).config -CLEANFILES = $(ASSEMBLY) +ASSEMBLY = $(ASSEMBLY_NAME).dll +ASSEMBLY_NAME = glib-sharp +noinst_DATA = $(ASSEMBLY) $(ASSEMBLY).config +CLEANFILES = $(ASSEMBLY) gtk-sharp.pub DISTCLEANFILES = $(ASSEMBLY).config AssemblyInfo.cs references = @@ -49,9 +49,20 @@ dist_sources = $(sources) EXTRA_DIST = \ $(dist_sources) \ $(ASSEMBLY).config.in \ - AssemblyInfo.cs.in \ + AssemblyInfo.cs.in \ makefile.win32 -$(ASSEMBLY): $(build_sources) +gtk-sharp.pub: $(top_srcdir)/gtk-sharp.pub + cp $(top_srcdir)/gtk-sharp.pub . + +$(ASSEMBLY): $(build_sources) gtk-sharp.pub $(CSC) /out:$(ASSEMBLY) /target:library $(references) $(build_sources) +install-data-local: + echo "$(GACUTIL) /i $(ASSEMBLY) /f /root $(DESTDIR)$(libdir)"; \ + $(GACUTIL) /i $(ASSEMBLY) /f /root $(DESTDIR)$(libdir) || exit 1; + +uninstall-local: + echo "$(GACUTIL) /u $(ASSEMBLY_NAME) /root $(DESTDIR)$(libdir)"; \ + $(GACUTIL) /u $(ASSEMBLY_NAME) /root $(DESTDIR)$(libdir) || exit 1; + diff --git a/gnome/AssemblyInfo.cs.in b/gnome/AssemblyInfo.cs.in index c58080fcc..5d7fb4668 100644 --- a/gnome/AssemblyInfo.cs.in +++ b/gnome/AssemblyInfo.cs.in @@ -3,4 +3,4 @@ using System.Runtime.CompilerServices; [assembly:AssemblyVersion("@API_VERSION@")] [assembly:AssemblyDelaySign(true)] -[assembly:AssemblyKeyFile("../gtk-sharp.pub")] +[assembly:AssemblyKeyFile("gtk-sharp.pub")] diff --git a/gnome/Makefile.am b/gnome/Makefile.am index 493e2bf22..181ca35e3 100644 --- a/gnome/Makefile.am +++ b/gnome/Makefile.am @@ -20,11 +20,10 @@ ASSEMBLY_NAME = gnome-sharp references = /r:../glib/glib-sharp.dll /r:../pango/pango-sharp.dll /r:../atk/atk-sharp.dll /r:../gdk/gdk-sharp.dll /r:../gtk/gtk-sharp.dll /r:../art/art-sharp.dll ASSEMBLY = $(ASSEMBLY_NAME).dll -assemblydir = $(libdir) gapidir = $(datadir)/gapi -assembly_DATA = $(TARGET) +noinst_DATA = $(TARGET) gapi_DATA = $(APIS) -CLEANFILES = $(ASSEMBLY) generated-stamp generated/*.cs $(API) +CLEANFILES = $(ASSEMBLY) generated-stamp generated/*.cs $(API) gtk-sharp.pub DISTCLEANFILES = gnome-sharp.pc $(ASSEMBLY).config AssemblyInfo.cs @@ -88,6 +87,21 @@ generated-stamp: $(API) ../generator/gapi_codegen.exe $(build_customs) --include $(INCLUDE_API) --outdir=generated --customdir=$(srcdir) --assembly-name=$(ASSEMBLY_NAME) \ && touch generated-stamp -$(ASSEMBLY): $(build_sources) generated-stamp +gtk-sharp.pub: $(top_srcdir)/gtk-sharp.pub + cp $(top_srcdir)/gtk-sharp.pub . + +$(ASSEMBLY): $(build_sources) generated-stamp gtk-sharp.pub $(CSC) --unsafe /out:$(ASSEMBLY) /target:library $(references) $(build_sources) generated/*.cs +install-data-local: + @if test -n '$(TARGET)'; then \ + echo "$(GACUTIL) /i $(ASSEMBLY) /f /root $(DESTDIR)$(libdir)"; \ + $(GACUTIL) /i $(ASSEMBLY) /f /root $(DESTDIR)$(libdir) || exit 1; \ + fi + +uninstall-local: + @if test -n '$(TARGET)'; then \ + echo "$(GACUTIL) /u $(ASSEMBLY_NAME) /root $(DESTDIR)$(libdir)"; \ + $(GACUTIL) /u $(ASSEMBLY_NAME) /root $(DESTDIR)$(libdir) || exit 1; \ + fi + diff --git a/gnomedb/AssemblyInfo.cs.in b/gnomedb/AssemblyInfo.cs.in index c58080fcc..5d7fb4668 100644 --- a/gnomedb/AssemblyInfo.cs.in +++ b/gnomedb/AssemblyInfo.cs.in @@ -3,4 +3,4 @@ using System.Runtime.CompilerServices; [assembly:AssemblyVersion("@API_VERSION@")] [assembly:AssemblyDelaySign(true)] -[assembly:AssemblyKeyFile("../gtk-sharp.pub")] +[assembly:AssemblyKeyFile("gtk-sharp.pub")] diff --git a/gnomedb/Makefile.am b/gnomedb/Makefile.am index f37abce40..5e8e137de 100644 --- a/gnomedb/Makefile.am +++ b/gnomedb/Makefile.am @@ -15,11 +15,10 @@ ASSEMBLY_NAME = gnomedb-sharp references = /r:../glib/glib-sharp.dll /r:../pango/pango-sharp.dll /r:../atk/atk-sharp.dll /r:../gdk/gdk-sharp.dll /r:../gtk/gtk-sharp.dll /r:../art/art-sharp.dll /r:../gnome/gnome-sharp.dll /r:../gda/gda-sharp.dll ASSEMBLY = $(ASSEMBLY_NAME).dll -assemblydir = $(libdir) gapidir = $(datadir)/gapi -assembly_DATA = $(TARGET) +noinst_DATA = $(TARGET) gapi_DATA = $(APIS) -CLEANFILES = $(ASSEMBLY) generated-stamp generated/*.cs $(API) +CLEANFILES = $(ASSEMBLY) generated-stamp generated/*.cs $(API) gtk-sharp.pub DISTCLEANFILES = gnomedb-sharp.pc $(ASSEMBLY).config AssemblyInfo.cs @@ -51,6 +50,21 @@ generated-stamp: $(API) ../generator/gapi_codegen.exe $(build_customs) --include $(INCLUDE_API) --outdir=generated --customdir=$(srcdir) --assembly-name=$(ASSEMBLY_NAME) \ && touch generated-stamp -$(ASSEMBLY): $(build_sources) generated-stamp +gtk-sharp.pub: $(top_srcdir)/gtk-sharp.pub + cp $(top_srcdir)/gtk-sharp.pub . + +$(ASSEMBLY): $(build_sources) generated-stamp gtk-sharp.pub $(CSC) --unsafe /out:$(ASSEMBLY) /target:library $(references) $(build_sources) generated/*.cs +install-data-local: + @if test -n '$(TARGET)'; then \ + echo "$(GACUTIL) /i $(ASSEMBLY) /f /root $(DESTDIR)$(libdir)"; \ + $(GACUTIL) /i $(ASSEMBLY) /f /root $(DESTDIR)$(libdir) || exit 1; \ + fi + +uninstall-local: + @if test -n '$(TARGET)'; then \ + echo "$(GACUTIL) /u $(ASSEMBLY_NAME) /root $(DESTDIR)$(libdir)"; \ + $(GACUTIL) /u $(ASSEMBLY_NAME) /root $(DESTDIR)$(libdir) || exit 1; \ + fi + diff --git a/gtk/AssemblyInfo.cs.in b/gtk/AssemblyInfo.cs.in index c58080fcc..5d7fb4668 100644 --- a/gtk/AssemblyInfo.cs.in +++ b/gtk/AssemblyInfo.cs.in @@ -3,4 +3,4 @@ using System.Runtime.CompilerServices; [assembly:AssemblyVersion("@API_VERSION@")] [assembly:AssemblyDelaySign(true)] -[assembly:AssemblyKeyFile("../gtk-sharp.pub")] +[assembly:AssemblyKeyFile("gtk-sharp.pub")] diff --git a/gtk/Makefile.am b/gtk/Makefile.am index 4ffdf0f68..da06d2e96 100644 --- a/gtk/Makefile.am +++ b/gtk/Makefile.am @@ -9,11 +9,10 @@ ASSEMBLY_NAME = gtk-sharp references = /r:../glib/glib-sharp.dll /r:../pango/pango-sharp.dll /r:../atk/atk-sharp.dll /r:../gdk/gdk-sharp.dll ASSEMBLY = $(ASSEMBLY_NAME).dll -assemblydir = $(libdir) gapidir = $(datadir)/gapi -assembly_DATA = $(ASSEMBLY) $(ASSEMBLY).config +noinst_DATA = $(ASSEMBLY) $(ASSEMBLY).config gapi_DATA = $(API) $(ADDITIONAL_API) -CLEANFILES = $(ASSEMBLY) generated-stamp generated/*.cs $(API) glue/generated.c +CLEANFILES = $(ASSEMBLY) generated-stamp generated/*.cs $(API) glue/generated.c gtk-sharp.pub DISTCLEANFILES = $(ASSEMBLY).config AssemblyInfo.cs sources = \ @@ -101,6 +100,17 @@ generated-stamp: $(API) $(srcdir)/$(ADDITIONAL_API) ../generator/gapi_codegen.ex --gluelib-name=gtksharpglue --glue-filename=glue/generated.c \ && touch generated-stamp -$(ASSEMBLY): $(build_sources) generated-stamp +gtk-sharp.pub: $(top_srcdir)/gtk-sharp.pub + cp $(top_srcdir)/gtk-sharp.pub . + +$(ASSEMBLY): $(build_sources) generated-stamp gtk-sharp.pub $(CSC) --unsafe /out:$(ASSEMBLY) /target:library $(references) $(build_sources) generated/*.cs +install-data-local: + echo "$(GACUTIL) /i $(ASSEMBLY) /f /root $(DESTDIR)$(libdir)"; \ + $(GACUTIL) /i $(ASSEMBLY) /f /root $(DESTDIR)$(libdir) || exit 1; + +uninstall-local: + echo "$(GACUTIL) /u $(ASSEMBLY_NAME) /root $(DESTDIR)$(libdir)"; \ + $(GACUTIL) /u $(ASSEMBLY_NAME) /root $(DESTDIR)$(libdir) || exit 1; + diff --git a/gtkhtml/AssemblyInfo.cs.in b/gtkhtml/AssemblyInfo.cs.in index c58080fcc..5d7fb4668 100644 --- a/gtkhtml/AssemblyInfo.cs.in +++ b/gtkhtml/AssemblyInfo.cs.in @@ -3,4 +3,4 @@ using System.Runtime.CompilerServices; [assembly:AssemblyVersion("@API_VERSION@")] [assembly:AssemblyDelaySign(true)] -[assembly:AssemblyKeyFile("../gtk-sharp.pub")] +[assembly:AssemblyKeyFile("gtk-sharp.pub")] diff --git a/gtkhtml/Makefile.am b/gtkhtml/Makefile.am index eedbe267b..d356a089a 100644 --- a/gtkhtml/Makefile.am +++ b/gtkhtml/Makefile.am @@ -15,11 +15,10 @@ ASSEMBLY_NAME = gtkhtml-sharp references = /r:../glib/glib-sharp.dll /r:../pango/pango-sharp.dll /r:../atk/atk-sharp.dll /r:../gdk/gdk-sharp.dll /r:../gtk/gtk-sharp.dll /r:../art/art-sharp.dll /r:../gnome/gnome-sharp.dll ASSEMBLY = $(ASSEMBLY_NAME).dll -assemblydir = $(libdir) gapidir = $(datadir)/gapi -assembly_DATA = $(TARGET) +noinst_DATA = $(TARGET) gapi_DATA = $(APIS) -CLEANFILES = $(ASSEMBLY) generated-stamp generated/*.cs $(API) +CLEANFILES = $(ASSEMBLY) generated-stamp generated/*.cs $(API) gtk-sharp.pub DISTCLEANFILES = gtkhtml-sharp.pc $(ASSEMBLY).config AssemblyInfo.cs @@ -51,6 +50,21 @@ generated-stamp: $(API) ../generator/gapi_codegen.exe $(build_customs) --include $(INCLUDE_API) --outdir=generated --customdir=$(srcdir) --assembly-name=$(ASSEMBLY_NAME) \ && touch generated-stamp -$(ASSEMBLY): $(build_sources) generated-stamp +gtk-sharp.pub: $(top_srcdir)/gtk-sharp.pub + cp $(top_srcdir)/gtk-sharp.pub . + +$(ASSEMBLY): $(build_sources) generated-stamp gtk-sharp.pub $(CSC) --unsafe /out:$(ASSEMBLY) /target:library $(references) $(build_sources) generated/*.cs +install-data-local: + @if test -n '$(TARGET)'; then \ + echo "$(GACUTIL) /i $(ASSEMBLY) /f /root $(DESTDIR)$(libdir)"; \ + $(GACUTIL) /i $(ASSEMBLY) /f /root $(DESTDIR)$(libdir) || exit 1; \ + fi + +uninstall-local: + @if test -n '$(TARGET)'; then \ + echo "$(GACUTIL) /u $(ASSEMBLY_NAME) /root $(DESTDIR)$(libdir)"; \ + $(GACUTIL) /u $(ASSEMBLY_NAME) /root $(DESTDIR)$(libdir) || exit 1; \ + fi + diff --git a/pango/AssemblyInfo.cs.in b/pango/AssemblyInfo.cs.in index c58080fcc..5d7fb4668 100644 --- a/pango/AssemblyInfo.cs.in +++ b/pango/AssemblyInfo.cs.in @@ -3,4 +3,4 @@ using System.Runtime.CompilerServices; [assembly:AssemblyVersion("@API_VERSION@")] [assembly:AssemblyDelaySign(true)] -[assembly:AssemblyKeyFile("../gtk-sharp.pub")] +[assembly:AssemblyKeyFile("gtk-sharp.pub")] diff --git a/pango/Makefile.am b/pango/Makefile.am index 0b198d91f..1f0aed7b0 100644 --- a/pango/Makefile.am +++ b/pango/Makefile.am @@ -5,11 +5,10 @@ ASSEMBLY_NAME = pango-sharp references = /r:../glib/glib-sharp.dll ASSEMBLY = $(ASSEMBLY_NAME).dll -assemblydir = $(libdir) gapidir = $(datadir)/gapi -assembly_DATA = $(ASSEMBLY) $(ASSEMBLY).config +noinst_DATA = $(ASSEMBLY) $(ASSEMBLY).config gapi_DATA = $(API) -CLEANFILES = $(ASSEMBLY) generated-stamp generated/*.cs $(API) +CLEANFILES = $(ASSEMBLY) generated-stamp generated/*.cs $(API) gtk-sharp.pub DISTCLEANFILES = $(ASSEMBLY).config AssemblyInfo.cs sources = \ @@ -45,6 +44,17 @@ generated-stamp: $(API) ../generator/gapi_codegen.exe $(build_customs) --outdir=generated --customdir=$(srcdir) --assembly-name=$(ASSEMBLY_NAME) \ && touch generated-stamp -$(ASSEMBLY): $(build_sources) generated-stamp +gtk-sharp.pub: $(top_srcdir)/gtk-sharp.pub + cp $(top_srcdir)/gtk-sharp.pub . + +$(ASSEMBLY): $(build_sources) generated-stamp gtk-sharp.pub $(CSC) --unsafe /out:$(ASSEMBLY) /target:library $(references) $(build_sources) generated/*.cs +install-data-local: + echo "$(GACUTIL) /i $(ASSEMBLY) /f /root $(DESTDIR)$(libdir)"; \ + $(GACUTIL) /i $(ASSEMBLY) /f /root $(DESTDIR)$(libdir) || exit 1; + +uninstall-local: + echo "$(GACUTIL) /u $(ASSEMBLY_NAME) /root $(DESTDIR)$(libdir)"; \ + $(GACUTIL) /u $(ASSEMBLY_NAME) /root $(DESTDIR)$(libdir) || exit 1; + diff --git a/rsvg/AssemblyInfo.cs.in b/rsvg/AssemblyInfo.cs.in index c58080fcc..5d7fb4668 100644 --- a/rsvg/AssemblyInfo.cs.in +++ b/rsvg/AssemblyInfo.cs.in @@ -3,4 +3,4 @@ using System.Runtime.CompilerServices; [assembly:AssemblyVersion("@API_VERSION@")] [assembly:AssemblyDelaySign(true)] -[assembly:AssemblyKeyFile("../gtk-sharp.pub")] +[assembly:AssemblyKeyFile("gtk-sharp.pub")] diff --git a/rsvg/Makefile.am b/rsvg/Makefile.am index 9642f1c87..d858b8a22 100644 --- a/rsvg/Makefile.am +++ b/rsvg/Makefile.am @@ -16,11 +16,10 @@ ASSEMBLY_NAME = rsvg-sharp references = /r:../glib/glib-sharp.dll /r:../pango/pango-sharp.dll /r:../atk/atk-sharp.dll /r:../gdk/gdk-sharp.dll /r:../gtk/gtk-sharp.dll /r:../art/art-sharp.dll ASSEMBLY = $(ASSEMBLY_NAME).dll -assemblydir = $(libdir) gapidir = $(datadir)/gapi -assembly_DATA = $(TARGET) +noinst_DATA = $(TARGET) gapi_DATA = $(APIS) -CLEANFILES = $(ASSEMBLY) generated-stamp generated/*.cs $(API) +CLEANFILES = $(ASSEMBLY) generated-stamp generated/*.cs $(API) gtk-sharp.pub DISTCLEANFILES = rsvg-sharp.pc $(ASSEMBLY).config AssemblyInfo.cs @@ -52,6 +51,21 @@ generated-stamp: $(API) ../generator/gapi_codegen.exe $(build_customs) --include $(INCLUDE_API) --outdir=generated --customdir=$(srcdir) --assembly-name=$(ASSEMBLY_NAME) \ && touch generated-stamp -$(ASSEMBLY): $(build_sources) generated-stamp +gtk-sharp.pub: $(top_srcdir)/gtk-sharp.pub + cp $(top_srcdir)/gtk-sharp.pub . + +$(ASSEMBLY): $(build_sources) generated-stamp gtk-sharp.pub $(CSC) --unsafe /out:$(ASSEMBLY) /target:library $(references) $(build_sources) generated/*.cs +install-data-local: + @if test -n '$(TARGET)'; then \ + echo "$(GACUTIL) /i $(ASSEMBLY) /f /root $(DESTDIR)$(libdir)"; \ + $(GACUTIL) /i $(ASSEMBLY) /f /root $(DESTDIR)$(libdir) || exit 1; \ + fi + +uninstall-local: + @if test -n '$(TARGET)'; then \ + echo "$(GACUTIL) /u $(ASSEMBLY_NAME) /root $(DESTDIR)$(libdir)"; \ + $(GACUTIL) /u $(ASSEMBLY_NAME) /root $(DESTDIR)$(libdir) || exit 1; \ + fi + diff --git a/vte/AssemblyInfo.cs.in b/vte/AssemblyInfo.cs.in index c58080fcc..5d7fb4668 100644 --- a/vte/AssemblyInfo.cs.in +++ b/vte/AssemblyInfo.cs.in @@ -3,4 +3,4 @@ using System.Runtime.CompilerServices; [assembly:AssemblyVersion("@API_VERSION@")] [assembly:AssemblyDelaySign(true)] -[assembly:AssemblyKeyFile("../gtk-sharp.pub")] +[assembly:AssemblyKeyFile("gtk-sharp.pub")] diff --git a/vte/Makefile.am b/vte/Makefile.am index 474bf2f5f..1ccc04c02 100644 --- a/vte/Makefile.am +++ b/vte/Makefile.am @@ -15,11 +15,10 @@ ASSEMBLY_NAME = vte-sharp references = /r:../glib/glib-sharp.dll /r:../pango/pango-sharp.dll /r:../atk/atk-sharp.dll /r:../gdk/gdk-sharp.dll /r:../gtk/gtk-sharp.dll ASSEMBLY = $(ASSEMBLY_NAME).dll -assemblydir = $(libdir) gapidir = $(datadir)/gapi -assembly_DATA = $(TARGET) +noinst_DATA = $(TARGET) gapi_DATA = $(APIS) -CLEANFILES = $(ASSEMBLY) generated-stamp generated/*.cs $(API) +CLEANFILES = $(ASSEMBLY) generated-stamp generated/*.cs $(API) gtk-sharp.pub DISTCLEANFILES = vte-sharp.pc $(ASSEMBLY).config AssemblyInfo.cs @@ -50,6 +49,21 @@ generated-stamp: $(API) ../generator/gapi_codegen.exe $(build_customs) --include $(INCLUDE_API) --outdir=generated --customdir=$(srcdir) --assembly-name=$(ASSEMBLY_NAME) \ && touch generated-stamp -$(ASSEMBLY): $(build_sources) generated-stamp +gtk-sharp.pub: $(top_srcdir)/gtk-sharp.pub + cp $(top_srcdir)/gtk-sharp.pub . + +$(ASSEMBLY): $(build_sources) generated-stamp gtk-sharp.pub $(CSC) --unsafe /out:$(ASSEMBLY) /target:library $(references) $(build_sources) generated/*.cs +install-data-local: + @if test -n '$(TARGET)'; then \ + echo "$(GACUTIL) /i $(ASSEMBLY) /f /root $(DESTDIR)$(libdir)"; \ + $(GACUTIL) /i $(ASSEMBLY) /f /root $(DESTDIR)$(libdir) || exit 1; \ + fi + +uninstall-local: + @if test -n '$(TARGET)'; then \ + echo "$(GACUTIL) /u $(ASSEMBLY_NAME) /root $(DESTDIR)$(libdir)"; \ + $(GACUTIL) /u $(ASSEMBLY_NAME) /root $(DESTDIR)$(libdir) || exit 1; \ + fi +