You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@uima.apache.org by bh...@apache.org on 2012/01/10 23:47:29 UTC
svn commit: r1229781 - in /uima/uimacpp/trunk: Makefile.am autogen.sh configure.ac

Author: bhavani
Date: Tue Jan 10 22:47:28 2012
New Revision: 1229781

URL: http://svn.apache.org/viewvc?rev=1229781&view=rev
Log:
UIMA-2328 cleanup packaging of linux source distribution

Modified:
    uima/uimacpp/trunk/Makefile.am
    uima/uimacpp/trunk/autogen.sh
    uima/uimacpp/trunk/configure.ac

Modified: uima/uimacpp/trunk/Makefile.am
URL: http://svn.apache.org/viewvc/uima/uimacpp/trunk/Makefile.am?rev=1229781&r1=1229780&r2=1229781&view=diff
==============================================================================
--- uima/uimacpp/trunk/Makefile.am (original)
+++ uima/uimacpp/trunk/Makefile.am Tue Jan 10 22:47:28 2012
@@ -16,13 +16,13 @@
 # ---------------------------------------------------------------------------
 
 #SUBDIRS = framework utils test
+AUTOMAKE_OPTIONS = foreign
 SUBDIRS = src
 ACLOCAL_AMFLAGS = -I m4
-EXTRA_DIST = docs data examples scriptators LICENSE buildsdk.sh README.4src README.4sdk NOTICE.4sdk RELEASE_NOTES.html
+EXTRA_DIST = docs/builddocs.sh docs/doxyheader.html docs/overview_and_setup.html docs/uimacppdocs.mak docs/uimacpp.dox data examples scriptators LICENSE buildsdk.sh README.4src README.4sdk NOTICE.4sdk RELEASE_NOTES.html autogen.sh
 
 
 dist-hook:
-	rm -rf `find $(distdir)/docs -name .svn`
 	rm -rf `find $(distdir)/data -name .svn`
 	rm -rf `find $(distdir)/examples -name .svn`
 	rm -rf `find $(distdir)/scriptators -name .svn`

Modified: uima/uimacpp/trunk/autogen.sh
URL: http://svn.apache.org/viewvc/uima/uimacpp/trunk/autogen.sh?rev=1229781&r1=1229780&r2=1229781&view=diff
==============================================================================
--- uima/uimacpp/trunk/autogen.sh (original)
+++ uima/uimacpp/trunk/autogen.sh Tue Jan 10 22:47:28 2012
@@ -1,3 +1,3 @@
-touch NEWS README AUTHORS ChangeLog
-autoreconf -I m4 --force --install
+#touch NEWS README AUTHORS ChangeLog
+autoreconf -I m4 -I config  --force --install
 rm -rf autom4te.cache

Modified: uima/uimacpp/trunk/configure.ac
URL: http://svn.apache.org/viewvc/uima/uimacpp/trunk/configure.ac?rev=1229781&r1=1229780&r2=1229781&view=diff
==============================================================================
--- uima/uimacpp/trunk/configure.ac (original)
+++ uima/uimacpp/trunk/configure.ac Tue Jan 10 22:47:28 2012
@@ -17,8 +17,9 @@
  # under the License.
 
 AC_INIT(uimacpp, 2.4.0)
+AC_CONFIG_AUX_DIR(config)
 AC_CONFIG_SRCDIR(src/framework/engine.cpp)
-AM_INIT_AUTOMAKE
+AM_INIT_AUTOMAKE([foreign])
 
 AC_CONFIG_MACRO_DIR([m4])
 AC_DISABLE_STATIC