Skip to content
This repository has been archived by the owner on Apr 18, 2020. It is now read-only.

Commit

Permalink
Make it pass distcheck.
Browse files Browse the repository at this point in the history
And actually build. Both the config and m4 variable referenced in autogen.sh
didn't exist on my system. Works fine now.
  • Loading branch information
rubenv committed Mar 6, 2010
1 parent d8e9d24 commit 0272ca3
Show file tree
Hide file tree
Showing 7 changed files with 26 additions and 13 deletions.
4 changes: 3 additions & 1 deletion Makefile.am
Original file line number Original file line Diff line number Diff line change
@@ -1,5 +1,7 @@
SUBDIRS = \ SUBDIRS = \
generator \ generator \
gio gio \
sources


EXTRA_DIST = sources/Makefile.am sources/Makefile.in EXTRA_DIST = sources/Makefile.am sources/Makefile.in
MAINTAINERCLEANFILES = Makefile.in
2 changes: 1 addition & 1 deletion autogen-generic.sh
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ sed -e "s/@GIO_SHARP_VERSION@/$GIO_SHARP_VERSION/" \
ln -f sources/sources-$GIO_SHARP_VERSION.xml sources/sources.xml ln -f sources/sources-$GIO_SHARP_VERSION.xml sources/sources.xml
ln -f gio/gio-api-$GIO_SHARP_VERSION.raw gio/gio-api.raw ln -f gio/gio-api-$GIO_SHARP_VERSION.raw gio/gio-api.raw


autoreconf -v --force --install -I config -I m4 autoreconf -v --force --install


if test x$NOCONFIGURE = x; then if test x$NOCONFIGURE = x; then
echo Running $srcdir/configure $conf_flags "$@" ... echo Running $srcdir/configure $conf_flags "$@" ...
Expand Down
3 changes: 2 additions & 1 deletion configure.ac.in
Original file line number Original file line Diff line number Diff line change
@@ -1,7 +1,7 @@
dnl Process this file with autoconf to produce a configure script. dnl Process this file with autoconf to produce a configure script.
AC_INIT(gio-sharp, @GIO_SHARP_VERSION@, stephane@delcroix.org) AC_INIT(gio-sharp, @GIO_SHARP_VERSION@, stephane@delcroix.org)
AC_CONFIG_AUX_DIR(config) AC_CONFIG_AUX_DIR(config)
AC_CONFIG_SRCDIR(gio/AssemblyInfo.cs) AC_CONFIG_SRCDIR(gio/AssemblyInfo.cs.in)


AM_INIT_AUTOMAKE AM_INIT_AUTOMAKE


Expand Down Expand Up @@ -52,6 +52,7 @@ AC_OUTPUT(
Makefile Makefile
generator/Makefile generator/Makefile
gio/Makefile gio/Makefile
gio/AssemblyInfo.cs
gio/gio-sharp.dll.config gio/gio-sharp.dll.config
gio/gio-sharp-2.0.pc gio/gio-sharp-2.0.pc
sources/Makefile sources/Makefile
Expand Down
1 change: 1 addition & 0 deletions generator/Makefile.am
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -62,3 +62,4 @@ gapi_codegen.exe: $(build_sources)
@echo -e "\n*** Building the generator" @echo -e "\n*** Building the generator"
$(CSC) /out:gapi_codegen.exe $(OFF_T_FLAGS) $(references) $(build_sources) $(CSC) /out:gapi_codegen.exe $(OFF_T_FLAGS) $(references) $(build_sources)


MAINTAINERCLEANFILES = Makefile.in
2 changes: 1 addition & 1 deletion gio/AssemblyInfo.cs → gio/AssemblyInfo.cs.in
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -3,5 +3,5 @@


[assembly:AssemblyVersion("2.14.0.0")] [assembly:AssemblyVersion("2.14.0.0")]
[assembly:AssemblyDelaySign(false)] [assembly:AssemblyDelaySign(false)]
[assembly:AssemblyKeyFile("gtk-sharp.snk")] [assembly:AssemblyKeyFile("@srcdir@/gtk-sharp.snk")]
[assembly:GLib.IgnoreClassInitializers] [assembly:GLib.IgnoreClassInitializers]
25 changes: 16 additions & 9 deletions gio/Makefile.am
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -2,9 +2,8 @@ UNSAFE = -unsafe
DEBUG = -debug DEBUG = -debug


SRCS = \ SRCS = \
AssemblyInfo.cs \ $(srcdir)/FileFactory.cs \
FileFactory.cs \ $(srcdir)/GioStream.cs
GioStream.cs


CUSTOMS = \ CUSTOMS = \
AppInfoAdapter.custom \ AppInfoAdapter.custom \
Expand All @@ -31,17 +30,18 @@ $(top_builddir)/generator/gapi_codegen.exe:


generated/File.cs: gio-api.xml $(CUSTOMS) $(builddir)/../generator/gapi_codegen.exe generated/File.cs: gio-api.xml $(CUSTOMS) $(builddir)/../generator/gapi_codegen.exe
@echo -e "\n*** Generating C# code" @echo -e "\n*** Generating C# code"
$(MONO) $(builddir)/../generator/gapi_codegen.exe $(GLIBSHARP_CFLAGS) --outdir=generated --customdir=$(srcdir) --generate gio-api.xml mkdir -p $(builddir)/generated
$(MONO) $(builddir)/../generator/gapi_codegen.exe $(GLIBSHARP_CFLAGS) --outdir=$(builddir)/generated --customdir=$(srcdir) --generate gio-api.xml


gio-sharp.dll: $(srcdir)/generated/File.cs $(SRCS) gio-sharp.dll: $(builddir)/generated/File.cs $(SRCS)
@echo -e "\n*** Building $@" @echo -e "\n*** Building $@"
if USING_MONO if USING_MONO
$(CSC) -target:library -out:$@ $(CSC_FLAGS) $(UNSAFE) $(DEBUG) $(ASSEMBLIES) $(SRCS) $(srcdir)/generated/*.cs $(CSC) -target:library -out:$@ $(CSC_FLAGS) $(UNSAFE) $(DEBUG) $(ASSEMBLIES) AssemblyInfo.cs $(SRCS) $(builddir)/generated/*.cs
else else
# !USING_MONO implies being on Windows # !USING_MONO implies being on Windows
# work around irritating csc misfeature: source file names on the # work around irritating csc misfeature: source file names on the
# command line from subdirs must use \ directory separators # command line from subdirs must use \ directory separators
@echo $(CSC) -target:library -out:$@ $(UNSAFE) $(DEBUG) $(ASSEMBLIES) $(SRCS) $(srcdir)/generated/*.cs | \ @echo $(CSC) -target:library -out:$@ $(UNSAFE) $(DEBUG) $(ASSEMBLIES) $(SRCS) AssemblyInfo.cs $(builddir)/generated/*.cs | \
sed -e 's!^/\(.\)/!\1:\\!' -e 's!/!\\!g' | cmd sed -e 's!^/\(.\)/!\1:\\!' -e 's!/!\\!g' | cmd
endif endif


Expand All @@ -52,7 +52,7 @@ if !USING_MONO
endif endif


uninstall-local: uninstall-local:
-$(GACUTIL) -u gio-sharp.dll $(GACUTIL_FLAGS) -$(GACUTIL) -u gio-sharp $(GACUTIL_FLAGS)
if !USING_MONO if !USING_MONO
rm $(DESTDIR)$(libdir)/mono/$(PACKAGE_VERSION)/gio-sharp.dll rm $(DESTDIR)$(libdir)/mono/$(PACKAGE_VERSION)/gio-sharp.dll
endif endif
Expand All @@ -64,9 +64,16 @@ pkgconfig_DATA = gio-sharp-2.0.pc
CLEANFILES = \ CLEANFILES = \
gio-sharp.dll \ gio-sharp.dll \
gio-sharp.dll.mdb \ gio-sharp.dll.mdb \
gio-api.xml gio-api.xml

DISTCLEANFILES = \
AssemblyInfo.cs \
generated/*.cs

MAINTAINERCLEANFILES = Makefile.in


EXTRA_DIST = \ EXTRA_DIST = \
AssemblyInfo.cs.in \
$(SRCS) \ $(SRCS) \
$(CUSTOMS) \ $(CUSTOMS) \
Gio.metadata \ Gio.metadata \
Expand Down
2 changes: 2 additions & 0 deletions sources/Makefile.am
Original file line number Original file line Diff line number Diff line change
@@ -1,2 +1,4 @@
api: sources.xml api: sources.xml
gapi2-parser sources.xml gapi2-parser sources.xml

MAINTAINERCLEANFILES = Makefile.in

0 comments on commit 0272ca3

Please sign in to comment.