Permalink
Browse files

Make it pass distcheck.

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...
1 parent d8e9d24 commit 0272ca3bb4d70e8aa4304bb027cff5932a91861d @rubenv rubenv committed Mar 6, 2010
Showing with 26 additions and 13 deletions.
  1. +3 −1 Makefile.am
  2. +1 −1 autogen-generic.sh
  3. +2 −1 configure.ac.in
  4. +1 −0 generator/Makefile.am
  5. +1 −1 gio/{AssemblyInfo.cs → AssemblyInfo.cs.in}
  6. +16 −9 gio/Makefile.am
  7. +2 −0 sources/Makefile.am
View
@@ -1,5 +1,7 @@
SUBDIRS = \
generator \
- gio
+ gio \
+ sources
EXTRA_DIST = sources/Makefile.am sources/Makefile.in
+MAINTAINERCLEANFILES = Makefile.in
View
@@ -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 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
echo Running $srcdir/configure $conf_flags "$@" ...
View
@@ -1,7 +1,7 @@
dnl Process this file with autoconf to produce a configure script.
AC_INIT(gio-sharp, @GIO_SHARP_VERSION@, stephane@delcroix.org)
AC_CONFIG_AUX_DIR(config)
-AC_CONFIG_SRCDIR(gio/AssemblyInfo.cs)
+AC_CONFIG_SRCDIR(gio/AssemblyInfo.cs.in)
AM_INIT_AUTOMAKE
@@ -52,6 +52,7 @@ AC_OUTPUT(
Makefile
generator/Makefile
gio/Makefile
+gio/AssemblyInfo.cs
gio/gio-sharp.dll.config
gio/gio-sharp-2.0.pc
sources/Makefile
View
@@ -62,3 +62,4 @@ gapi_codegen.exe: $(build_sources)
@echo -e "\n*** Building the generator"
$(CSC) /out:gapi_codegen.exe $(OFF_T_FLAGS) $(references) $(build_sources)
+MAINTAINERCLEANFILES = Makefile.in
@@ -3,5 +3,5 @@
[assembly:AssemblyVersion("2.14.0.0")]
[assembly:AssemblyDelaySign(false)]
-[assembly:AssemblyKeyFile("gtk-sharp.snk")]
+[assembly:AssemblyKeyFile("@srcdir@/gtk-sharp.snk")]
[assembly:GLib.IgnoreClassInitializers]
View
@@ -2,9 +2,8 @@ UNSAFE = -unsafe
DEBUG = -debug
SRCS = \
- AssemblyInfo.cs \
- FileFactory.cs \
- GioStream.cs
+ $(srcdir)/FileFactory.cs \
+ $(srcdir)/GioStream.cs
CUSTOMS = \
AppInfoAdapter.custom \
@@ -31,17 +30,18 @@ $(top_builddir)/generator/gapi_codegen.exe:
generated/File.cs: gio-api.xml $(CUSTOMS) $(builddir)/../generator/gapi_codegen.exe
@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 $@"
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
# !USING_MONO implies being on Windows
# work around irritating csc misfeature: source file names on the
# 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
endif
@@ -52,7 +52,7 @@ if !USING_MONO
endif
uninstall-local:
- -$(GACUTIL) -u gio-sharp.dll $(GACUTIL_FLAGS)
+ -$(GACUTIL) -u gio-sharp $(GACUTIL_FLAGS)
if !USING_MONO
rm $(DESTDIR)$(libdir)/mono/$(PACKAGE_VERSION)/gio-sharp.dll
endif
@@ -64,9 +64,16 @@ pkgconfig_DATA = gio-sharp-2.0.pc
CLEANFILES = \
gio-sharp.dll \
gio-sharp.dll.mdb \
- gio-api.xml
+ gio-api.xml
+
+DISTCLEANFILES = \
+ AssemblyInfo.cs \
+ generated/*.cs
+
+MAINTAINERCLEANFILES = Makefile.in
EXTRA_DIST = \
+ AssemblyInfo.cs.in \
$(SRCS) \
$(CUSTOMS) \
Gio.metadata \
View
@@ -1,2 +1,4 @@
api: sources.xml
gapi2-parser sources.xml
+
+MAINTAINERCLEANFILES = Makefile.in

0 comments on commit 0272ca3

Please sign in to comment.