diff --git a/Makefile.am b/Makefile.am index 190f01f..33ebcd2 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,3 +1,5 @@ +ACLOCAL_AMFLAGS = -I m4 + SUBDIRS = sources sources/glue doc pkgconfigdir = $(libdir)/pkgconfig diff --git a/configure.ac b/configure.ac index 355bdff..ae9f3d2 100644 --- a/configure.ac +++ b/configure.ac @@ -16,7 +16,7 @@ ASSEMBLY_PC="webkitgtk-sharp-3.0" ASSEMBLY_SHORTNAME="webkitgtk" ASSEMBLY_TITLE="WebKit#" ASSEMBLY_VERSION="2.0.0" -AC_SUBST([ACLOCAL_AMFLAGS], ["-I m4 \${ACLOCAL_FLAGS}"]) +AC_CONFIG_MACRO_DIR([m4]) AC_SUBST(ASSEMBLY_NAME) AC_SUBST(ASSEMBLY_VERSION) @@ -30,21 +30,21 @@ AC_SUBST(ASSEMBLY_PC) dnl Check for pkg-config AC_PATH_PROG(PKG_CONFIG, pkg-config, no) -if test "x$PKG_CONFIG" = "xno"; then +if test "$PKG_CONFIG" = "no"; then AC_MSG_ERROR(['pkg-config' is not in your PATH.]) fi dnl Check for Mono PKG_CHECK_MODULES(MONO_DEPENDENCY, mono >= 1.0, has_mono=true, has_mono=false) -if test "x$has_mono" = "xtrue"; then -1 AC_PATH_PROG(RUNTIME, mono, no) +if test "$has_mono" = "true"; then + AC_PATH_PROG(RUNTIME, mono, no) AC_PATH_PROG(CSC, mcs, no) LIB_PREFIX=.so LIB_SUFFIX= else AC_PATH_PROG(CSC, csc.exe, no) - if test x$CSC = "xno"; then + if test "$CSC" = "no"; then AC_MSG_ERROR([You need to install either mono or .Net]) else RUNTIME= @@ -54,17 +54,17 @@ else fi CS="C#" -if test "x$CSC" = "xno" ; then +if test "$CSC" = "no" ; then AC_MSG_ERROR([No $CS compiler found]) fi AC_PATH_PROG(GACUTIL, gacutil, no) -if test "x$GACUTIL" = "xno" ; then +if test "$GACUTIL" = "no" ; then AC_MSG_ERROR([No gacutil tool found]) fi GACUTIL_FLAGS="/package $ASSEMBLY_NAME /root "'$(DESTDIR)$(prefix)/lib' - + AC_SUBST(RUNTIME) AC_SUBST(CSC) AC_SUBST(GACUTIL) @@ -86,10 +86,10 @@ PKG_CHECK_MODULES(GAPI, gapi-3.0 >= 2.99.2) dnl Check for gapi AC_PATH_PROG(GAPI_PARSER, gapi3-parser, no) -if test "x$GAPI_PARSER" = "xno"; then +if test "$GAPI_PARSER" = "no"; then AC_MSG_CHECKING(for gapi3-parser.exe) GAPI_PARSER=`which gapi3-parser.exe 2> /dev/null` - if test "x$GAPI_PARSER" = "xno" ; then + if test "$GAPI_PARSER" = "no" ; then AC_MSG_ERROR(['gapi3_parser'/'gapi3-parser.exe' not found.]) fi AC_MSG_RESULT($GAPI_PARSER) @@ -98,10 +98,10 @@ fi AC_SUBST(GAPI_PARSER) AC_PATH_PROG(GAPI_FIXUP, gapi3-fixup, no) -if test "x$GAPI_FIXUP" = "xno"; then +if test "$GAPI_FIXUP" = "no"; then AC_MSG_CHECKING(for gapi3-fixup.exe) GAPI_FIXUP=`which gapi3-fixup.exe 2> /dev/null` - if test "x$GAPI_FIXUP" = "xno" ; then + if test "$GAPI_FIXUP" = "no" ; then AC_MSG_ERROR(['gapi3_fixup'/'gapi3-fixup.exe' not found.]) fi AC_MSG_RESULT($GAPI_FIXUP) @@ -110,10 +110,10 @@ fi AC_SUBST(GAPI_FIXUP) AC_PATH_PROG(GAPI_CODEGEN, gapi3-codegen, no) -if test "x$GAPI_CODEGEN" = "xno"; then +if test "$GAPI_CODEGEN" = "no"; then AC_MSG_CHECKING(for gapi3_codegen.exe) GAPI_CODEGEN=`which gapi3_codegen.exe 2> /dev/null` - if test "x$GAPI_CODEGEN" = "xno" ; then + if test "$GAPI_CODEGEN" = "no" ; then AC_MSG_ERROR(['gapi3-codegen'/'gapi3_codegen.exe' not found.]) fi AC_MSG_RESULT([$GAPI_CODEGEN]) @@ -123,8 +123,9 @@ AC_SUBST(GAPI_CODEGEN) dnl Check for monodoc AC_PATH_PROG(MDASSEMBLER, mdassembler, no) -AC_PATH_PROG(MONODOCER, monodocer, no) -if test "x$MONODOCER" = "xno" -o "x$MDASSEMBLER" = "xno"; then +AC_PATH_PROG(MDOC, mdoc, no) +if test "$MDOC" = "no" -o "$MDASSEMBLER" = "no" +then enable_monodoc=no doc_sources_dir= else @@ -132,9 +133,9 @@ else doc_sources_dir="`pkg-config --variable=sourcesdir monodoc`" fi AC_SUBST(MDASSEMBLER) -AC_SUBST(MONODOCER) +AC_SUBST(MDOC) -AM_CONDITIONAL(ENABLE_MONODOC, test "x$enable_monodoc" = "xyes") +AM_CONDITIONAL(ENABLE_MONODOC, test "$enable_monodoc" = "yes") dnl Check for WebKit PKG_CHECK_MODULES(WEBKIT, webkitgtk-3.0 >= 2.0) webkitgtk_prefix=/usr @@ -164,5 +165,5 @@ echo "---------------------" echo "" echo " * Installation prefix: $prefix" echo " * compiler: $CSC" -echo " * Documentation: ($MONODOC)" +echo " * Documentation: ($enable_monodoc)" echo "" diff --git a/doc/Makefile.am b/doc/Makefile.am index 6f9fc80..a9730d3 100644 --- a/doc/Makefile.am +++ b/doc/Makefile.am @@ -10,15 +10,13 @@ endif ASSEMBLIES = $(top_srcdir)/out/$(ASSEMBLY_NAME).dll -UPDATE_ASSEMBLIES = $(addprefix -assembly:, $(ASSEMBLIES)) - all: $(TARGETS) update: - $(MONODOCER) $(UPDATE_ASSEMBLIES) -path:en + $(MDOC) update $(SOUPSHARP_LIBS) --out=en $(ASSEMBLIES) $(srcdir)/en/*/*.xml $(srcdir)/en/*.xml: - $(MONODOCER) $(UPDATE_ASSEMBLIES) -path:en + $(MDOC) update $(SOUPSHARP_LIBS) --out=en $(ASSEMBLIES) $(ASSEMBLY_NAME)-docs.source: @echo "Generating $@" @@ -31,6 +29,7 @@ $(ASSEMBLY_NAME)-docs.zip $(ASSEMBLY_NAME)-docs.tree: $(srcdir)/en/*/*.xml $(src $(MDASSEMBLER) --ecma $(srcdir)/en -o $(ASSEMBLY_NAME)-docs CLEANFILES = $(TARGETS) +DISTCLEANFILES = $(srcdir)/en/*/*.xml $(srcdir)/en/*.xml NAMESPACES=$(ASSEMBLY_NAMESPACE) diff --git a/out/webkitgtk-sharp.dll.config b/out/webkitgtk-sharp.dll.config index f067feb..9765959 100644 --- a/out/webkitgtk-sharp.dll.config +++ b/out/webkitgtk-sharp.dll.config @@ -1,3 +1,5 @@ + + diff --git a/sources/Makefile.am b/sources/Makefile.am index aca6456..b502a6b 100644 --- a/sources/Makefile.am +++ b/sources/Makefile.am @@ -13,9 +13,9 @@ sources = build_sources = AssemblyInfo.cs $(sources) -CLEANFILES = $(DLL) generated-stamp generated/*.cs $(API) +CLEANFILES = $(DLL) generated-stamp generated/*/*.cs $(API) -DISTCLEANFILES = AssemblyInfo.cs $(DLLMAP) +DISTCLEANFILES = AssemblyInfo.cs noinst_DATA = $(DLL) @@ -42,7 +42,7 @@ generated-stamp: $(API) $(DLL): $(build_sources) generated-stamp $(CSC) -nowarn:169 -unsafe -target:library $(GTK_SHARP_LIBS) \ - $(build_sources) $(MONOCAIRO_LIBS) $(SOUPSHARP_LIBS) generated/*.cs generated/*/*.cs -out:$(DLL) + $(build_sources) $(MONOCAIRO_LIBS) $(SOUPSHARP_LIBS) generated/*/*.cs -out:$(DLL) install-data-local: echo "$(GACUTIL) /i $(DLL) /f $(GACUTIL_FLAGS)"; \ diff --git a/sources/glue/Makefile.am b/sources/glue/Makefile.am index 0e0bc6c..aeeab48 100644 --- a/sources/glue/Makefile.am +++ b/sources/glue/Makefile.am @@ -8,11 +8,13 @@ libwebkitgtksharpglue_1_10_2_la_LDFLAGS = -module -avoid-version -no-undefined libwebkitgtksharpglue_1_10_2_la_LIBADD = $(WEBKIT_LIBS) -INCLUDES = $(WEBKIT_CFLAGS) -I$(top_srcdir) +AM_CPPFLAGS = $(WEBKIT_CFLAGS) -I$(top_srcdir) libwebkitgtksharpglue.dll: $(libwebkitgtksharpglue_1_10_2_la_OBJECTS) libwebkitgtksharpglue.rc libwebkitgtksharpglue.def ./build-dll libwebkitgtksharpglue $(VERSION) CLEANFILES = lib*.a lib*.dll +DISTCLEANFILES = $(nodist_libwebkitgtksharpglue_1_10_2_la_SOURCES) + EXTRA_DIST = diff --git a/webkitgtk-sharp-3.0.pc.in b/webkitgtk-sharp-3.0.pc.in index 84e5e2c..163b7a9 100644 --- a/webkitgtk-sharp-3.0.pc.in +++ b/webkitgtk-sharp-3.0.pc.in @@ -2,9 +2,11 @@ prefix=@prefix@ exec_prefix=${prefix} libdir=@libdir@ pkglibdir=${exec_prefix}/lib/mono/@ASSEMBLY_NAME@ +gapidir=@GAPIXMLDIR@ Name: @ASSEMBLY_TITLE@ Description: @ASSEMBLY_DESCRIPTION@ Version: @VERSION@ Requires: Libs: -r:${pkglibdir}/@ASSEMBLY_NAME@.dll +Cflags: -I:${gapidir}/webkitgtk-sharp-api.xml