X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=t%2Fvala-libs.sh;h=f1ed99ab2852a19b47ba2bccdbd84842b961dc6d;hb=6febcd41b3dcf99a89aaf21329c00fdadcd68771;hp=f6a7ba9b30b4d974fc57836ff9d76dd2910e5357;hpb=c2a52bf0e8e87b8f347ca22b9ab2da7613bc4336;p=platform%2Fupstream%2Fautomake.git diff --git a/t/vala-libs.sh b/t/vala-libs.sh old mode 100755 new mode 100644 index f6a7ba9..f1ed99a --- a/t/vala-libs.sh +++ b/t/vala-libs.sh @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2012 Free Software Foundation, Inc. +# Copyright (C) 2012-2013 Free Software Foundation, Inc. # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -18,11 +18,10 @@ # And use of vapi files to call C code from Vala. required="valac cc pkg-config libtoolize GNUmake" -. ./defs || exit 1 +. test-init.sh cat >> configure.ac << 'END' AC_PROG_CC -AM_PROG_CC_C_O AM_PROG_AR AC_PROG_RANLIB AC_PROG_LIBTOOL @@ -32,11 +31,12 @@ AC_OUTPUT END cat > Makefile.am << 'END' +AUTOMAKE_OPTIONS = subdir-objects lib_LIBRARIES = libmu.a lib_LTLIBRARIES = src/libzardoz.la libmu_a_SOURCES = mu.vala mu2.c mu.vapi mu2.h libmu_a_CPPFLAGS = -DOKOKIMDEFINED=1 -libmu_a_VALAFLAGS = --profile=posix --vapidir=$(srcdir) +libmu_a_VALAFLAGS = --vapidir=$(srcdir) AM_CFLAGS = $(GOBJECT_CFLAGS) src_libzardoz_la_LIBADD = $(GOBJECT_LIBS) src_libzardoz_la_SOURCES = src/zardoz-foo.vala src/zardoz-bar.vala @@ -49,8 +49,6 @@ $ACLOCAL $AUTOCONF $AUTOMAKE -a -grep PKG_CHECK_MODULES configure && skip_ "pkg-config m4 macros not found" - ./configure cat > mu2.c << 'END' @@ -78,7 +76,7 @@ int main () } END -mkdir src +mkdir -p src cat > src/zardoz-foo.vala << 'END' using GLib; public class Foo {