[paragui-cvs] CVS: paragui Makefile.am,1.1.1.1.6.4,1.1.1.1.6.5 autogen.sh,1.1.1.1.6.3,1.1.1.1.6.4 configure.in,1.3.6.9,1.3.6.10

[Alexander Pipelka <address@hidden>]

Update of /cvsroot/paragui/paragui
In directory subversions:/tmp/cvs-serv31884

Modified Files:
      Tag: devel-1-0
        Makefile.am autogen.sh configure.in 
Log Message:
build system fixes (i luv autoconf)



Index: Makefile.am
===================================================================
RCS file: /cvsroot/paragui/paragui/Makefile.am,v
retrieving revision 1.1.1.1.6.4
retrieving revision 1.1.1.1.6.5
diff -C2 -r1.1.1.1.6.4 -r1.1.1.1.6.5
*** Makefile.am 25 Jun 2002 09:14:20 -0000      1.1.1.1.6.4
--- Makefile.am 3 Jul 2002 14:01:43 -0000       1.1.1.1.6.5
***************
*** 1,3 ****
! AUTOMAKE_OPTIONS = 1.4
  
  SUBDIRS = include src data bindings
--- 1,5 ----
! DISTCHECK_CONFIGURE_FLAGS=--enable-internalexpat --enable-internalphysfs
! 
! AUTOMAKE_OPTIONS = foreign
  
  SUBDIRS = include src data bindings
***************
*** 31,38 ****
  
  release:
-       if test ! -f $(top_builddir)/test/Makefile; then \
-           mkdir -p $(top_builddir)/test ; \
-           cd $(top_builddir)/test ; ../$(srcdir)/test/configure 
--disable-paraguitest ; \
-       fi
        rm -f $(top_builddir)/VisualC.zip
        rm -f $(top_builddir)/data/*.zip
--- 33,36 ----
***************
*** 42,48 ****
        touch `find`
  
- clean:
-       rm -f $(top_builddir)/VisualC.zip
- 
  VisualC.zip:
        mkdir -p $(top_builddir)/VC-build
--- 40,43 ----
***************
*** 63,74 ****
        mkdir $(distdir)/lib
        cp $(srcdir)/lib/README.txt $(distdir)/lib
-       rm -f $(distdir)/VisualC.zip
-       cp -f $(top_builddir)/VisualC.zip $(distdir)
-       rm -f $(distdir)/data/*.zip
-       cp -f $(top_builddir)/data/*.zip $(distdir)/data
- 
- dist_bz2: $(PACKAGE)-$(VERSION).tar.gz
-       gzip -c -d $(PACKAGE)-$(VERSION).tar.gz > $(PACKAGE)-$(VERSION).tar
-       bzip2 $(PACKAGE)-$(VERSION).tar
  
  install-hook:
--- 58,61 ----
***************
*** 78,93 ****
        cp $(PACKAGE)-$(VERSION).tar.gz $(RPM_ROOT)
        rpm -ba $(PACKAGE).spec
- 
- rpm_i686: $(PACKAGE)-$(VERSION).tar.gz 
-       cp $(PACKAGE)-$(VERSION).tar.gz $(RPM_ROOT)
-       rpm -ba --target=i686-linux $(PACKAGE).spec
- 
- rpm_i586: $(PACKAGE)-$(VERSION).tar.gz 
-       cp $(PACKAGE)-$(VERSION).tar.gz $(RPM_ROOT)
-       rpm -ba --target i586-linux $(PACKAGE).spec
- 
- rpm_i486: $(PACKAGE)-$(VERSION).tar.gz
-       cp $(PACKAGE)-$(VERSION).tar.gz $(RPM_ROOT)
-       rpm -ba --target=i486-linux $(PACKAGE).spec
  
  dist-beos: 
--- 65,68 ----

Index: autogen.sh
===================================================================
RCS file: /cvsroot/paragui/paragui/autogen.sh,v
retrieving revision 1.1.1.1.6.3
retrieving revision 1.1.1.1.6.4
diff -C2 -r1.1.1.1.6.3 -r1.1.1.1.6.4
*** autogen.sh  23 Jun 2002 09:11:48 -0000      1.1.1.1.6.3
--- autogen.sh  3 Jul 2002 14:01:43 -0000       1.1.1.1.6.4
***************
*** 29,36 ****
  autoconf || ( echo "***ERROR*** autoconf failed." ; exit 1 )
  
- echo "Running autogen.sh in the \"test\" directory ..."
- cp -f paragui.m4 test/acinclude.m4
- test/autogen.sh
- 
  echo 
  echo "Checking for tools needed to maintain the package ..."
--- 29,32 ----

Index: configure.in
===================================================================
RCS file: /cvsroot/paragui/paragui/configure.in,v
retrieving revision 1.3.6.9
retrieving revision 1.3.6.10
diff -C2 -r1.3.6.9 -r1.3.6.10
*** configure.in        25 Jun 2002 18:47:10 -0000      1.3.6.9
--- configure.in        3 Jul 2002 14:01:43 -0000       1.3.6.10
***************
*** 576,579 ****
--- 576,583 ----
  AC_SUBST(RPM_ROOT)
  
+ dnl
+ dnl configure the "test" directory
+ dnl
+ 
  # Finally create all the generated files
  AC_OUTPUT([
***************
*** 591,594 ****
--- 595,599 ----
  bindings/Makefile
  bindings/python/Makefile
+ test/Makefile
  paragui.spec
  paragui-config