You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucy.apache.org by nw...@apache.org on 2012/12/27 18:49:16 UTC

[lucy-commits] [5/7] git commit: refs/heads/c-bindings-wip1 - Remove old C bindings build system

Remove old C bindings build system


Project: http://git-wip-us.apache.org/repos/asf/lucy/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucy/commit/6a732f2b
Tree: http://git-wip-us.apache.org/repos/asf/lucy/tree/6a732f2b
Diff: http://git-wip-us.apache.org/repos/asf/lucy/diff/6a732f2b

Branch: refs/heads/c-bindings-wip1
Commit: 6a732f2b499b2d96544f8e2b2583259e9ff079dc
Parents: 7f604e9
Author: Nick Wellnhofer <we...@aevum.de>
Authored: Mon Dec 24 01:39:35 2012 +0100
Committer: Nick Wellnhofer <we...@aevum.de>
Committed: Mon Dec 24 01:39:35 2012 +0100

----------------------------------------------------------------------
 c/Makefile.am            |   31 -----
 c/README                 |    6 +-
 c/bootstrap.sh           |   44 -------
 c/build/liblucy.pl       |  139 -----------------------
 c/configure.ac           |   54 ---------
 c/install-sh             |  251 -----------------------------------------
 c/liblucy-config.in      |  104 -----------------
 c/liblucy.pc.in          |   28 -----
 c/src/Makefile.am        |   38 ------
 c/src/liblucy.c          |   27 -----
 c/src/lucy-test.c        |   26 -----
 c/t/000-sanity-check.t.c |   36 ------
 c/t/Makefile.am          |   32 -----
 c/t/test.sh              |   18 ---
 14 files changed, 3 insertions(+), 831 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/lucy/blob/6a732f2b/c/Makefile.am
----------------------------------------------------------------------
diff --git a/c/Makefile.am b/c/Makefile.am
deleted file mode 100644
index 65c000c..0000000
--- a/c/Makefile.am
+++ /dev/null
@@ -1,31 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements.  See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You under the Apache License, Version 2.0
-# (the "License"); you may not use this file except in compliance with
-# the License.  You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-AUTOMAKE_OPTIONS = foreign
-ACLOCAL_AMFLAGS = -I m4
-SUBDIRS = src t
-
-test: check
-
-bin_SCRIPTS = liblucy-config
-pkgconfigdir = $(libdir)/pkgconfig
-pkgconfig_DATA = liblucy.pc
-distdir = $(PACKAGE)-$(VERSION)
-
-EXTRA_DIST = m4
-
-dist-hook:
-	rm -rf `find $(distdir) -name .svn`
-

http://git-wip-us.apache.org/repos/asf/lucy/blob/6a732f2b/c/README
----------------------------------------------------------------------
diff --git a/c/README b/c/README
index 489b3b0..8907b4d 100644
--- a/c/README
+++ b/c/README
@@ -26,10 +26,10 @@ are not defined in core.
    HACKING
 ================================================================================
 
-The C host language uses the autotools toolchain. Get started with:
+The build system for the C host language is in development. Get started with:
 
- % ./bootstrap.sh
- % ./configure && make test
+ % make
+ % make test
 
 
 

http://git-wip-us.apache.org/repos/asf/lucy/blob/6a732f2b/c/bootstrap.sh
----------------------------------------------------------------------
diff --git a/c/bootstrap.sh b/c/bootstrap.sh
deleted file mode 100755
index 7f2bb25..0000000
--- a/c/bootstrap.sh
+++ /dev/null
@@ -1,44 +0,0 @@
-#! /bin/sh
-
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements.  See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You under the Apache License, Version 2.0
-# (the "License"); you may not use this file except in compliance with
-# the License.  You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-
-echo "$0 - for initialization of liblucy build environemnt"
-echo "     not needed for user building"
-
-#add --include-deps if you want to bootstrap with any other compiler than gcc
-#automake --add-missing --copy --include-deps
-
-set -x
-
-if [ ! $SVNDIR ]; then
-    SVNDIR=.
-fi
-
-# Mac OS X 10.6 no longer has libtoolize but glibtoolize instead
-LIBTOOLIZE=`which libtoolize`
-if [ ! $LIBTOOLIZE ]; then 
-    LIBTOOLIZE=`which glibtoolize`
-fi
-
-#echo "libtoolize = $LIBTOOLIZE"
-
-aclocal \
- && $LIBTOOLIZE --force --copy \
- && automake --add-missing --include-deps --copy --foreign \
- && autoconf \
- && rm -f config.cache
-

http://git-wip-us.apache.org/repos/asf/lucy/blob/6a732f2b/c/build/liblucy.pl
----------------------------------------------------------------------
diff --git a/c/build/liblucy.pl b/c/build/liblucy.pl
deleted file mode 100644
index b4321bd..0000000
--- a/c/build/liblucy.pl
+++ /dev/null
@@ -1,139 +0,0 @@
-#!/usr/bin/env perl
-
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements.  See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You under the Apache License, Version 2.0
-# (the "License"); you may not use this file except in compliance with
-# the License.  You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-use strict;
-use warnings;
-
-use File::Spec::Functions
-    qw( catdir catfile splitpath updir no_upwards rel2abs );
-use File::Path qw( mkpath rmtree );
-use File::Copy qw( copy move );
-use File::Find qw( find );
-use Cwd qw( getcwd );
-
-my $is_distro_not_devel = -e 'core';
-my $base_dir = rel2abs( $is_distro_not_devel ? getcwd() : updir() );
-
-my $DEBUG = $ENV{LIBLUCY_DEBUG} || 0;
-
-$DEBUG and print "base_dir=$base_dir\n";
-
-my $usage = "$0 make-cmd cc-cmd cc-flags\n";
-
-die $usage if $ARGV[0] and $ARGV[0] =~ m/^\-\-?h/;
-
-my $MAKE     = shift(@ARGV) || 'make';
-my $CC       = shift(@ARGV) || 'cc';
-my $CC_FLAGS = shift(@ARGV) || '';
-my $EXE      = shift(@ARGV) || '';
-
-my $CHARMONIZER_ORIG_DIR = catdir( $base_dir, 'charmonizer' );
-my $CHARMONIZE_EXE_PATH
-    = catfile( $CHARMONIZER_ORIG_DIR, "charmonize${EXE}" );
-my $CHARMONY_PATH  = 'charmony.h';
-my $LEMON_DIR      = catdir( $base_dir, 'lemon' );
-my $LEMON_EXE_PATH = catfile( $LEMON_DIR, "lemon${EXE}" );
-my $SNOWSTEM_SRC_DIR
-    = catdir( $base_dir, qw( modules analysis snowstem source ) );
-my $SNOWSTEM_INC_DIR = catdir( $SNOWSTEM_SRC_DIR, 'include' );
-my $SNOWSTOP_SRC_DIR
-    = catdir( $base_dir, qw( modules analysis snowstop source ) );
-my $CORE_SOURCE_DIR = catdir( $base_dir, 'core' );
-my $CLOWNFISH_DIR   = catdir( $base_dir, 'clownfish' );
-my $CLOWNFISH_BUILD = catfile( $CLOWNFISH_DIR, 'Build' );
-
-# run this program
-main();
-
-sub main {
-    build_charmony();
-    build_charmonizer_tests();
-    build_lemon();
-
-}
-
-sub run_make {
-    my (%params)          = @_;
-    my @command           = @{ $params{args} };
-    my $dir               = $params{dir};
-    my $current_directory = getcwd();
-    $DEBUG and print "cur=$current_directory dir=$dir\n";
-    if ($dir) {
-        chdir $dir or die "failed to chdir $dir";
-    }
-    unshift @command, 'CC=' . $CC;
-    if ( $CC =~ /^cl\b/ ) {
-        unshift @command, "-f", "Makefile.MSVC";
-    }
-    elsif ( $^O =~ /mswin/i ) {
-        unshift @command, "-f", "Makefile.MinGW";
-    }
-    unshift @command, $MAKE;
-    system(@command) and die("$MAKE failed");
-    chdir $current_directory if $dir;
-}
-
-sub build_charmonize {
-    print "Building $CHARMONIZE_EXE_PATH...\n\n";
-    run_make(
-        dir  => $CHARMONIZER_ORIG_DIR,
-        args => [],
-    );
-}
-
-# Run the charmonize executable, creating the charmony.h file.
-sub build_charmony {
-    my $self = shift;
-    build_charmonize();
-
-    print "\nWriting $CHARMONY_PATH...\n\n";
-
-    # Clean up after charmonize if it doesn't succeed on its own.
-    # TODO
-    #$self->add_to_cleanup("_charm*");
-    #$self->add_to_cleanup($CHARMONY_PATH);
-
-    # Prepare arguments to charmonize.
-    my $flags = $CC_FLAGS;
-    $flags =~ s/"/\\"/g;
-    my @command = ( $CHARMONIZE_EXE_PATH, $CC, $flags );
-    if ( $ENV{CHARM_VALGRIND} ) {
-        unshift @command, "valgrind", "--leak-check=yes";
-    }
-
-    $DEBUG and print join( " ", @command ), $/;
-
-    system(@command) and die "Failed to write $CHARMONY_PATH: $!";
-}
-
-sub build_charmonizer_tests {
-    print "Building Charmonizer Tests...\n\n";
-    my $flags = join( " ", $CC_FLAGS, '-I' . rel2abs( getcwd() ) );
-    $flags =~ s/"/\\"/g;
-    run_make(
-        dir  => $CHARMONIZER_ORIG_DIR,
-        args => [ "DEFS=$flags", "tests" ],
-    );
-}
-
-sub build_lemon {
-    print "Building the Lemon parser generator...\n\n";
-    run_make(
-        dir  => $LEMON_DIR,
-        args => [],
-    );
-}

http://git-wip-us.apache.org/repos/asf/lucy/blob/6a732f2b/c/configure.ac
----------------------------------------------------------------------
diff --git a/c/configure.ac b/c/configure.ac
deleted file mode 100644
index e0ff2fd..0000000
--- a/c/configure.ac
+++ /dev/null
@@ -1,54 +0,0 @@
-dnl Licensed to the Apache Software Foundation (ASF) under one or more
-dnl contributor license agreements.  See the NOTICE file distributed with
-dnl this work for additional information regarding copyright ownership.
-dnl The ASF licenses this file to You under the Apache License, Version 2.0
-dnl (the "License"); you may not use this file except in compliance with
-dnl the License.  You may obtain a copy of the License at
-dnl
-dnl     http://www.apache.org/licenses/LICENSE-2.0
-dnl
-dnl Unless required by applicable law or agreed to in writing, software
-dnl distributed under the License is distributed on an "AS IS" BASIS,
-dnl WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-dnl See the License for the specific language governing permissions and
-dnl limitations under the License.
-
-AC_INIT([liblucy], [0.3.0], [The Apache Lucy Project <dev@lucy.apache.org], [http://lucy.apache.org/])
-dnl AM_CONFIG_HEADER(src/acconfig.h)
-AC_PROG_CC
-AC_PROG_CXX
-AC_PROG_INSTALL
-AC_CONFIG_MACRO_DIR([m4])
-AC_CONFIG_AUX_DIR(config)
-AC_SUBST(ac_aux_dir)
-AC_CONFIG_FILES([
-                Makefile
-                src/Makefile
-                t/Makefile
-                liblucy.pc
-                liblucy-config
-                ])
-PACKAGE=liblucy
-
-MAJOR_VERSION=0
-MINOR_VERSION=3
-MICRO_VERSION=0
-INTERFACE_AGE=0
-BINARY_AGE=0
-VERSION=$MAJOR_VERSION.$MINOR_VERSION.$MICRO_VERSION
-
-AC_ARG_ENABLE(daystamp,
-             AC_HELP_STRING([--enable-daystamp], [Adds today's date to version]),
-             daystamp=yes,)
-
-if test x$daystamp = xyes; then
-        TODAY=`/bin/date +%Y%m%d`
-        VERSION="$VERSION-$TODAY"
-fi
-LIBLUCY_VERSION=$VERSION
-AC_SUBST(LIBLUCY_VERSION)
-AM_INIT_AUTOMAKE($PACKAGE, $VERSION)
-                
-AC_PROG_LIBTOOL
-AC_PROG_MAKE_SET
-AC_OUTPUT

http://git-wip-us.apache.org/repos/asf/lucy/blob/6a732f2b/c/install-sh
----------------------------------------------------------------------
diff --git a/c/install-sh b/c/install-sh
deleted file mode 100755
index 0784e7d..0000000
--- a/c/install-sh
+++ /dev/null
@@ -1,251 +0,0 @@
-#!/bin/sh
-#
-# install - install a program, script, or datafile
-# This comes from X11R5 (mit/util/scripts/install.sh).
-#
-# Copyright 1991 by the Massachusetts Institute of Technology
-#
-# Permission to use, copy, modify, distribute, and sell this software and its
-# documentation for any purpose is hereby granted without fee, provided that
-# the above copyright notice appear in all copies and that both that
-# copyright notice and this permission notice appear in supporting
-# documentation, and that the name of M.I.T. not be used in advertising or
-# publicity pertaining to distribution of the software without specific,
-# written prior permission.  M.I.T. makes no representations about the
-# suitability of this software for any purpose.  It is provided "as is"
-# without express or implied warranty.
-#
-# Calling this script install-sh is preferred over install.sh, to prevent
-# `make' implicit rules from creating a file called install from it
-# when there is no Makefile.
-#
-# This script is compatible with the BSD install script, but was written
-# from scratch.  It can only install one file at a time, a restriction
-# shared with many OS's install programs.
-
-
-# set DOITPROG to echo to test this script
-
-# Don't use :- since 4.3BSD and earlier shells don't like it.
-doit="${DOITPROG-}"
-
-
-# put in absolute paths if you don't have them in your path; or use env. vars.
-
-mvprog="${MVPROG-mv}"
-cpprog="${CPPROG-cp}"
-chmodprog="${CHMODPROG-chmod}"
-chownprog="${CHOWNPROG-chown}"
-chgrpprog="${CHGRPPROG-chgrp}"
-stripprog="${STRIPPROG-strip}"
-rmprog="${RMPROG-rm}"
-mkdirprog="${MKDIRPROG-mkdir}"
-
-transformbasename=""
-transform_arg=""
-instcmd="$mvprog"
-chmodcmd="$chmodprog 0755"
-chowncmd=""
-chgrpcmd=""
-stripcmd=""
-rmcmd="$rmprog -f"
-mvcmd="$mvprog"
-src=""
-dst=""
-dir_arg=""
-
-while [ x"$1" != x ]; do
-    case $1 in
-        -c) instcmd="$cpprog"
-            shift
-            continue;;
-
-        -d) dir_arg=true
-            shift
-            continue;;
-
-        -m) chmodcmd="$chmodprog $2"
-            shift
-            shift
-            continue;;
-
-        -o) chowncmd="$chownprog $2"
-            shift
-            shift
-            continue;;
-
-        -g) chgrpcmd="$chgrpprog $2"
-            shift
-            shift
-            continue;;
-
-        -s) stripcmd="$stripprog"
-            shift
-            continue;;
-
-        -t=*) transformarg=`echo $1 | sed 's/-t=//'`
-            shift
-            continue;;
-
-        -b=*) transformbasename=`echo $1 | sed 's/-b=//'`
-            shift
-            continue;;
-
-        *)  if [ x"$src" = x ]
-            then
-                src=$1
-            else
-                # this colon is to work around a 386BSD /bin/sh bug
-                :
-                dst=$1
-            fi
-            shift
-            continue;;
-    esac
-done
-
-if [ x"$src" = x ]
-then
-        echo "install:  no input file specified"
-        exit 1
-else
-        :
-fi
-
-if [ x"$dir_arg" != x ]; then
-        dst=$src
-        src=""
-        
-        if [ -d $dst ]; then
-                instcmd=:
-                chmodcmd=""
-        else
-                instcmd=$mkdirprog
-        fi
-else
-
-# Waiting for this to be detected by the "$instcmd $src $dsttmp" command
-# might cause directories to be created, which would be especially bad 
-# if $src (and thus $dsttmp) contains '*'.
-
-        if [ -f "$src" ] || [ -d "$src" ]
-        then
-                :
-        else
-                echo "install:  $src does not exist"
-                exit 1
-        fi
-        
-        if [ x"$dst" = x ]
-        then
-                echo "install:  no destination specified"
-                exit 1
-        else
-                :
-        fi
-
-# If destination is a directory, append the input filename; if your system
-# does not like double slashes in filenames, you may need to add some logic
-
-        if [ -d $dst ]
-        then
-                dst="$dst"/`basename $src`
-        else
-                :
-        fi
-fi
-
-## this sed command emulates the dirname command
-dstdir=`echo $dst | sed -e 's,[^/]*$,,;s,/$,,;s,^$,.,'`
-
-# Make sure that the destination directory exists.
-#  this part is taken from Noah Friedman's mkinstalldirs script
-
-# Skip lots of stat calls in the usual case.
-if [ ! -d "$dstdir" ]; then
-defaultIFS='
-        '
-IFS="${IFS-${defaultIFS}}"
-
-oIFS="${IFS}"
-# Some sh's can't handle IFS=/ for some reason.
-IFS='%'
-set - `echo ${dstdir} | sed -e 's@/@%@g' -e 's@^%@/@'`
-IFS="${oIFS}"
-
-pathcomp=''
-
-while [ $# -ne 0 ] ; do
-        pathcomp="${pathcomp}${1}"
-        shift
-
-        if [ ! -d "${pathcomp}" ] ;
-        then
-                $mkdirprog "${pathcomp}"
-        else
-                :
-        fi
-
-        pathcomp="${pathcomp}/"
-done
-fi
-
-if [ x"$dir_arg" != x ]
-then
-        $doit $instcmd $dst &&
-
-        if [ x"$chowncmd" != x ]; then $doit $chowncmd $dst; else : ; fi &&
-        if [ x"$chgrpcmd" != x ]; then $doit $chgrpcmd $dst; else : ; fi &&
-        if [ x"$stripcmd" != x ]; then $doit $stripcmd $dst; else : ; fi &&
-        if [ x"$chmodcmd" != x ]; then $doit $chmodcmd $dst; else : ; fi
-else
-
-# If we're going to rename the final executable, determine the name now.
-
-        if [ x"$transformarg" = x ] 
-        then
-                dstfile=`basename $dst`
-        else
-                dstfile=`basename $dst $transformbasename | 
-                        sed $transformarg`$transformbasename
-        fi
-
-# don't allow the sed command to completely eliminate the filename
-
-        if [ x"$dstfile" = x ] 
-        then
-                dstfile=`basename $dst`
-        else
-                :
-        fi
-
-# Make a temp file name in the proper directory.
-
-        dsttmp=$dstdir/#inst.$$#
-
-# Move or copy the file name to the temp name
-
-        $doit $instcmd $src $dsttmp &&
-
-        trap "rm -f ${dsttmp}" 0 &&
-
-# and set any options; do chmod last to preserve setuid bits
-
-# If any of these fail, we abort the whole thing.  If we want to
-# ignore errors from any of these, just make sure not to ignore
-# errors from the above "$doit $instcmd $src $dsttmp" command.
-
-        if [ x"$chowncmd" != x ]; then $doit $chowncmd $dsttmp; else :;fi &&
-        if [ x"$chgrpcmd" != x ]; then $doit $chgrpcmd $dsttmp; else :;fi &&
-        if [ x"$stripcmd" != x ]; then $doit $stripcmd $dsttmp; else :;fi &&
-        if [ x"$chmodcmd" != x ]; then $doit $chmodcmd $dsttmp; else :;fi &&
-
-# Now rename the file to the real destination.
-
-        $doit $rmcmd -f $dstdir/$dstfile &&
-        $doit $mvcmd $dsttmp $dstdir/$dstfile 
-
-fi &&
-
-
-exit 0

http://git-wip-us.apache.org/repos/asf/lucy/blob/6a732f2b/c/liblucy-config.in
----------------------------------------------------------------------
diff --git a/c/liblucy-config.in b/c/liblucy-config.in
deleted file mode 100644
index ef306e7..0000000
--- a/c/liblucy-config.in
+++ /dev/null
@@ -1,104 +0,0 @@
-#!/bin/sh
-
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements.  See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You under the Apache License, Version 2.0
-# (the "License"); you may not use this file except in compliance with
-# the License.  You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-prefix=@prefix@
-exec_prefix=@exec_prefix@
-includedir=@includedir@
-libdir=@libdir@
-
-usage()
-{
-    cat <<EOF
-Usage: liblucy-config [OPTION]
-
-Known values for OPTION are:
-
-  --prefix=DIR          liblucy prefix [default $prefix]
-  --exec-prefix=DIR     liblucy exec prefix [default $exec_prefix]
-  --libs                print library linking information
-  --libtool-libs        print linking information for use with libtool
-  --cflags              print pre-processor and compiler flags
-  --help                display this help and exit
-  --version             output version information
-EOF
-
-    exit $1
-}
-
-if test $# -eq 0; then
-    usage 1
-fi
-
-cflags=false
-libs=false
-
-while test $# -gt 0; do
-    case "$1" in
-    -*=*) optarg=`echo "$1" | sed 's/[-_a-zA-Z0-9]*=//'` ;;
-    *) optarg= ;;
-    esac
-
-    case "$1" in
-    --prefix=*)
-        prefix=$optarg
-        includedir=$prefix/include
-        libdir=$prefix/lib
-        ;;
-
-    --prefix)
-        echo $prefix
-        ;;
-
-    --exec-prefix=*)
-      exec_prefix=$optarg
-      libdir=$exec_prefix/lib
-      ;;
-
-    --exec-prefix)
-      echo $exec_prefix
-      ;;
-
-    --version)
-        echo @VERSION@
-        exit 0
-        ;;
-
-    --help)
-        usage 0
-        ;;
-
-    --cflags)
-        echo @CFLAGS@ -I${includedir}
-        ;;
-
-    --libtool-libs)
-        echo ${libdir}/liblucy.la
-        ;;
-
-    --libs)
-        echo -L${libdir} -llucy @LIBS@
-        ;;
-
-    *)
-        usage 1
-        exit 1
-        ;;
-    esac
-    shift
-done
-
-exit 0

http://git-wip-us.apache.org/repos/asf/lucy/blob/6a732f2b/c/liblucy.pc.in
----------------------------------------------------------------------
diff --git a/c/liblucy.pc.in b/c/liblucy.pc.in
deleted file mode 100644
index 0484f05..0000000
--- a/c/liblucy.pc.in
+++ /dev/null
@@ -1,28 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements.  See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You under the Apache License, Version 2.0
-# (the "License"); you may not use this file except in compliance with
-# the License.  You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-prefix=@prefix@
-exec_prefix=@exec_prefix@
-libdir=@libdir@
-includedir=@includedir@
-
-
-Name: liblucy
-Version: @VERSION@
-Description: liblucy - Apache Lucy C library
-Requires: 
-Libs: -L${libdir} -llucy @Z_LIBS@ @LIBS@
-Cflags: @CFLAGS@ -I${includedir} @Z_CFLAGS@
-

http://git-wip-us.apache.org/repos/asf/lucy/blob/6a732f2b/c/src/Makefile.am
----------------------------------------------------------------------
diff --git a/c/src/Makefile.am b/c/src/Makefile.am
deleted file mode 100644
index b310334..0000000
--- a/c/src/Makefile.am
+++ /dev/null
@@ -1,38 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements.  See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You under the Apache License, Version 2.0
-# (the "License"); you may not use this file except in compliance with
-# the License.  You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-AM_CFLAGS= -Wall 
-# -pg is for profiling
-#AM_CFLAGS= -Wall -pg
-LIBLUCY_VERSION = @LIBLUCY_VERSION@
-
-myprep: liblucy.c
-	cd .. && perl build/liblucy.pl && mv charmony.h src/
-
-all: myprep
-	echo "make all complete"
-
-AM_LDFLAGS= -I$(top_srcdir)/src -I. -L$(top_srcdir)/src -llucy
-bin_PROGRAMS = lucy-test
-lucy_test_SOURCES = lucy-test.c
-
-lib_LTLIBRARIES = liblucy.la
-liblucy_la_LDFLAGS = -no-undefined -version-info 0:3:0 
-#liblucy_la_LDFLAGS = -no-undefined -version-info 0:3:0 -pg
-#include_HEADERS = liblucy.h
-
-liblucy_la_SOURCES = liblucy.c
-
-TESTS = $(check_PROGRAMS) lucy-test

http://git-wip-us.apache.org/repos/asf/lucy/blob/6a732f2b/c/src/liblucy.c
----------------------------------------------------------------------
diff --git a/c/src/liblucy.c b/c/src/liblucy.c
deleted file mode 100644
index de20bfa..0000000
--- a/c/src/liblucy.c
+++ /dev/null
@@ -1,27 +0,0 @@
-/* Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "charmony.h"
-#include <stdio.h>
-
-int lucy_test();
-
-int lucy_test() {
-    printf("charmony achieved!\n");
-    printf("size of CHY_SIZEOF_INT=%d\n", CHY_SIZEOF_INT);
-    return 1;
-}
-

http://git-wip-us.apache.org/repos/asf/lucy/blob/6a732f2b/c/src/lucy-test.c
----------------------------------------------------------------------
diff --git a/c/src/lucy-test.c b/c/src/lucy-test.c
deleted file mode 100644
index d3ef4d0..0000000
--- a/c/src/lucy-test.c
+++ /dev/null
@@ -1,26 +0,0 @@
-/* Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include <stdarg.h>
-#include <stdio.h>
-
-int main();
-
-int main() {
-    lucy_test();
-    return 0;
-}
-

http://git-wip-us.apache.org/repos/asf/lucy/blob/6a732f2b/c/t/000-sanity-check.t.c
----------------------------------------------------------------------
diff --git a/c/t/000-sanity-check.t.c b/c/t/000-sanity-check.t.c
deleted file mode 100644
index 7d0ca7d..0000000
--- a/c/t/000-sanity-check.t.c
+++ /dev/null
@@ -1,36 +0,0 @@
-/* Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#define CHAZ_USE_SHORT_NAMES
-
-#include <stdarg.h>
-#include <stdio.h>
-#include <string.h>
-
-#include "Charmonizer/Test.h";
-#include "Charmonizer/Test.c";
-
-static void
-S_run_tests(void) {
-    LONG_EQ(0, 0, "sanity check");
-}
-
-int main(int argc, char **argv) {
-    Test_start(1);
-    S_run_tests();
-    return !Test_finish();
-}
-

http://git-wip-us.apache.org/repos/asf/lucy/blob/6a732f2b/c/t/Makefile.am
----------------------------------------------------------------------
diff --git a/c/t/Makefile.am b/c/t/Makefile.am
deleted file mode 100644
index 440ac52..0000000
--- a/c/t/Makefile.am
+++ /dev/null
@@ -1,32 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements.  See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You under the Apache License, Version 2.0
-# (the "License"); you may not use this file except in compliance with
-# the License.  You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-AM_CFLAGS= -Wall 
-# -pg is for profiling
-#AM_CFLAGS= -Wall -pg
-LIBLUCY_VERSION = @LIBLUCY_VERSION@
-
-myldflags= -I$(top_srcdir)/src -I. -I$(top_srcdir)/../charmonizer/src -L$(top_srcdir)/src -llucy
-AM_LDFLAGS= $(myldflags)
-bin_PROGRAMS = 000-sanity-check.t
-000_sanity_check_t_SOURCES = 000-sanity-check.t.c
-000_sanity_check_t_LDFLAGS = $(myldflags)
-000_sanity_check_t_CFLAGS = $(myldflags)
-
-
-TESTS = $(check_PROGRAMS) test.sh 
-
-test:
-	prove *t

http://git-wip-us.apache.org/repos/asf/lucy/blob/6a732f2b/c/t/test.sh
----------------------------------------------------------------------
diff --git a/c/t/test.sh b/c/t/test.sh
deleted file mode 100755
index 89c91c0..0000000
--- a/c/t/test.sh
+++ /dev/null
@@ -1,18 +0,0 @@
-#!/bin/sh
-
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements.  See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You under the Apache License, Version 2.0
-# (the "License"); you may not use this file except in compliance with
-# the License.  You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-prove *t