Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
remove custom make references
  • Loading branch information
piersharding committed Feb 9, 2013
1 parent 59ab946 commit 2902886
Show file tree
Hide file tree
Showing 6 changed files with 18 additions and 22 deletions.
4 changes: 4 additions & 0 deletions ChangeLog
Expand Up @@ -9,3 +9,7 @@ Version: 0.2 (2013-01-31, released)
Version: 0.3 (2013-02-05, released)

* Fix build process

Version: 0.4 (2013-02-10, released)

* Remove custom make references
6 changes: 3 additions & 3 deletions DESCRIPTION
@@ -1,6 +1,6 @@
Package: RMonet
Version: 0.3
Date: 2013-01-31
Version: 0.4
Date: 2013-02-10
Author: Piers Harding <piers@ompka.net>
Maintainer: Piers Harding <piers@ompka.net>
Title: MonetDB SQL client interface for R
Expand All @@ -13,4 +13,4 @@ URL: http://github.com/piersharding/RMonet
BugReports: http://github.com/piersharding/RMonet/issues
BuildVignettes: no
Repository: CRAN
Date/Publication: 2012-02-04 12:00:00
Date/Publication: 2012-02-10 12:00:00
1 change: 1 addition & 0 deletions README
Expand Up @@ -38,6 +38,7 @@ sudo -u monetdb monetdb start voc
sudo -u monetdb monetdb release voc
sudo -u monetdb monetdb status

Download the voc test data from https://github.com/piersharding/RMonet/blob/master/voc-export-all.csv.gz
gunzip -c ./voc-export-all.csv.gz | mclient -u monetdb -d voc

The default password for the user 'monetdb' is 'monetdb'
Expand Down
18 changes: 9 additions & 9 deletions configure
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
# Generated by GNU Autoconf 2.69 for RMonet 0.3.
# Generated by GNU Autoconf 2.69 for RMonet 0.4.
#
# Report bugs to <piers@ompka.net>.
#
Expand Down Expand Up @@ -580,8 +580,8 @@ MAKEFLAGS=
# Identity of this package.
PACKAGE_NAME='RMonet'
PACKAGE_TARNAME='rmonet'
PACKAGE_VERSION='0.3'
PACKAGE_STRING='RMonet 0.3'
PACKAGE_VERSION='0.4'
PACKAGE_STRING='RMonet 0.4'
PACKAGE_BUGREPORT='piers@ompka.net'
PACKAGE_URL=''

Expand Down Expand Up @@ -1229,7 +1229,7 @@ if test "$ac_init_help" = "long"; then
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
\`configure' configures RMonet 0.3 to adapt to many kinds of systems.
\`configure' configures RMonet 0.4 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
Expand Down Expand Up @@ -1290,7 +1290,7 @@ fi

if test -n "$ac_init_help"; then
case $ac_init_help in
short | recursive ) echo "Configuration of RMonet 0.3:";;
short | recursive ) echo "Configuration of RMonet 0.4:";;
esac
cat <<\_ACEOF
Expand Down Expand Up @@ -1378,7 +1378,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
RMonet configure 0.3
RMonet configure 0.4
generated by GNU Autoconf 2.69
Copyright (C) 2012 Free Software Foundation, Inc.
Expand Down Expand Up @@ -1863,7 +1863,7 @@ cat >config.log <<_ACEOF
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
It was created by RMonet $as_me 0.3, which was
It was created by RMonet $as_me 0.4, which was
generated by GNU Autoconf 2.69. Invocation command line was
$ $0 $@
Expand Down Expand Up @@ -4050,7 +4050,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
This file was extended by RMonet $as_me 0.3, which was
This file was extended by RMonet $as_me 0.4, which was
generated by GNU Autoconf 2.69. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
Expand Down Expand Up @@ -4112,7 +4112,7 @@ _ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
RMonet config.status 0.3
RMonet config.status 0.4
configured by $0, generated by GNU Autoconf 2.69,
with options \\"\$ac_cs_config\\"
Expand Down
2 changes: 1 addition & 1 deletion configure.ac
@@ -1,6 +1,6 @@
# original by Friedrich Leisch, much changed by BDR

AC_INIT([RMonet], 0.3, [piers@ompka.net])
AC_INIT([RMonet], 0.4, [piers@ompka.net])

dnl Select an optional include path, from a configure option
dnl or from an environment variable.
Expand Down
9 changes: 0 additions & 9 deletions src/Makevars.in
Expand Up @@ -3,12 +3,3 @@ PKG_CPPFLAGS=@PKG_CPPFLAGS@
PKG_LIBS=@PKG_LIBS@
LIBS=@LIBS@

all: $(SHLIB)

$(SHLIB): RMonet.o

RMonet.o: RMonet.c
$(CC) -c $(PKG_CPPFLAGS) $(CPPFLAGS) $(CFLAGS) $(RMONET_CPPFLAGS) $(OPTIMIZE) $(MPOLLUTE) $(CCCDLFLAGS) -fPIC RMonet.c $(PKG_LIBS)



0 comments on commit 2902886

Please sign in to comment.