diff options
author | Constantin <jucovschi@gmail.com> | 2010-06-14 11:55:37 +0200 |
---|---|---|
committer | Constantin <jucovschi@gmail.com> | 2010-06-14 11:59:29 +0200 |
commit | 5bca4a8cdffeb5a4846383435d215f4d3a63bf32 (patch) | |
tree | 4068b6687854686ebf1daa6f6f88a839110bcab1 | |
parent | dd1ba9ad320e297f1acf1027604a368f1ddbde6c (diff) | |
parent | 82821f8a31e5f98c27dced51f1bba0fc6637d598 (diff) | |
download | rasdaman-upstream-5bca4a8cdffeb5a4846383435d215f4d3a63bf32.tar.gz rasdaman-upstream-5bca4a8cdffeb5a4846383435d215f4d3a63bf32.tar.xz rasdaman-upstream-5bca4a8cdffeb5a4846383435d215f4d3a63bf32.zip |
Merge branch 'master' of ssh://kahlua:9141/home/git/rasdaman
-rw-r--r-- | Makefile.am | 2 | ||||
-rw-r--r-- | configure.ac | 1 |
2 files changed, 1 insertions, 2 deletions
diff --git a/Makefile.am b/Makefile.am index d326f51..257e396 100644 --- a/Makefile.am +++ b/Makefile.am @@ -45,7 +45,7 @@ SUBDIRS = relblobif relindexif relmddif relcatalogif reladminif relstorageif \ indexmgr catalogmgr tilemgr storagemgr compression commline network \ raslib clientcomm servercomm rasodmg qlparser conversion \ mddmgr httpserver mymalloc time server rasmgr rascontrol rasdl \ - applications bin insertutils manuals_and_examples include java + applications bin insertutils manuals_and_examples include all: cd petascope; ant diff --git a/configure.ac b/configure.ac index fb88112..77615aa 100644 --- a/configure.ac +++ b/configure.ac @@ -131,7 +131,6 @@ AC_CONFIG_FILES([Makefile manuals_and_examples/Makefile insertutils/Makefile include/Makefile - java/Makefile ]) # --------------- Header Template Definitions ---------------------- |