Commit Graph

37 Commits

Author SHA1 Message Date
Fred L. Drake, Jr.
06f03f92da Fix installation when building from outside the source directory.
Closes SF patch #566901.
2002-07-11 18:54:42 +00:00
Fred L. Drake, Jr.
0c406cce19 Split the install and uninstall targets into library and non-library
components, creating the new targets installlib and uninstalllib.
2002-06-03 18:16:07 +00:00
Greg Stein
733fc33825 conftools/libtool.m4 is generated by buildconf.sh, so make sure that
it gets tossed during 'extraclean'
2002-06-01 22:35:28 +00:00
Greg Stein
72ced69405 Work on fixing bug #462960
* add Apache's version of config.guess and config.sub, which are both
  recent, and have some helpful mods

* buildconf.sh: tweak call to libtoolize to avoid overwriting the above

* conftools/.cvsignore: the new files are supposed to be there

* Makefile.in: tweak to use $(prefix) for the manual page so that it
  picks up install-time prefix changes. tossed an old comment. tweak
  the 'extraclean' rule to avoid tossing the added config.* files.
2002-06-01 22:29:30 +00:00
Fred L. Drake, Jr.
cad79377e7 Factor out the definition of the directory the manual page is
installed into; hopefully this will fix the RPM construction.
2002-05-31 15:51:21 +00:00
Greg Stein
04d54677dc Add some cygwin fixes.
* Makefile.in:
  - from cygwin: add -no-undefined to the library link line

* conftools/get-version.sh: (new file)
  - script to extract the version number from expat.h

* configure.in:
  (some from the cygwin patch)
  - update the prereq to 2.52 instead of just 2.50
  - update the AC_INIT line to 2.52 standards: include the package
    name, version (with a lot of gunk to get this), and where to send
    bugs)
  - update the output file generation to 2.52 standards

* make-release.sh:
  - update to use the new get-version.sh script

* lib/expat.h:
  - from cygwin: add a little define for CYGWIN
2002-05-18 00:26:59 +00:00
Greg Stein
950c9a1124 A couple more tweaks for config.h -> expat_config.h 2002-05-17 21:38:44 +00:00
Greg Stein
9fcff4a9eb Various configuration fixes, focused primarily around expat_config.h
(which used to be called config.h)

* configure.in:
  - change the header name to expat_config.h to prevent any possible
    conflict with some other packages 'config.h'
  - add a prerequisite on autoconf 2.50 or newer
  - shift some acconfig.h values to AC_DEFINE() values

* MANIFEST:
  - rename config.h.in to expat_config.h.in

* Makefile.in:
  - clean out expat_config.h* instead of config.h*

* acconfig.h:
  - remove the XML_NS, XML_DTD, and XML_CONTEXT_BYTES symbols; they
    are now defined directly by configure.in
  - shift the memmove() compatibility to xmlparse.c, its only consumer
  - remove the @BOTTOM@ part since there are no more values to put at
    the bottom of expat_config.h.in via acconfig.h

* xmlparse.c:
  - switch from config.h to expat_config.h
  - insert macro to define memmove() if it isn't available, but
    bcopy() is available. also, changed one branch to #error rather
    than insert bogus code.

* xmlrole.c:
  - tweak the copyright header, per Fred-ism
  - remove the unused RCSId[] variable (no other file has these)
  - switch from config.h to expat_config.h

* xmltok.c:
  - switch from config.h to expat_config.h
2002-05-17 21:30:07 +00:00
Fred L. Drake, Jr.
74b32a6fc3 Make the uninstall target use the right location for the header file. 2002-05-17 14:12:25 +00:00
Fred L. Drake, Jr.
d05c7a58f7 Added target to run checks based on xmlwf and James Clark's test cases.
This is not run by "make check" since it requires unzip, wget, and network
access to set up the tests.  Use "make run-xmltext" to run the tests.
2002-04-29 21:31:18 +00:00
Fred L. Drake, Jr.
198ab270fe Revise the data accumulation to be at least a little separated from the
actual test code.  Not pretty & lacking in internal documentation, but
allows the test code to be a bit more readable.
2002-04-25 04:04:42 +00:00
Fred L. Drake, Jr.
91e3f5c543 Add support for the xmlwf manpage, both for install and uninstall. 2002-04-22 17:04:36 +00:00
Greg Stein
5fa57b76e6 xmlwf should depend on the library, too. 2002-04-22 10:22:48 +00:00
Fred L. Drake, Jr.
d084912ca5 Added missing library to link line for tests; not sure how this had not
been checked in!
2002-04-20 13:24:59 +00:00
Fred L. Drake, Jr.
be3da03386 Simplify the command used to run the test program. 2002-04-20 13:11:16 +00:00
Fred L. Drake, Jr.
1d5e745673 Make the sample applications depend on the Expat library. 2002-04-19 18:57:24 +00:00
Greg Stein
a13d856e8f * Switch to a single, top-level Makefile (simplification, consistency)
* use libtool to compile/link all programs
* remove */Makefile.in and remove them from configure
* remove autom4te.cache after running autoconf
* remove .o from the FILEMAP logic in configure and the Make system;
  provides more flexibility in the Makefile to use it
* for VPATH builds: create the build subdirs by running
  "make mkdir-init" from the configure script
* adjust .cvsignore files to account for presence of .libs now
2001-12-07 10:19:31 +00:00
Fred L. Drake, Jr.
b9ca027b09 Revert previous change and use an alternate approach, this time actually
tested on one of the platforms that exhibited the problem this tries to
fix.  Solution contributed by Michael C. Maggio; thanks!
2001-10-02 16:40:17 +00:00
Fred L. Drake, Jr.
96a1672aea Abandon the use of directory names as target names; there are enough
platforms for which .PHONY is not implemented that this causes the build to
be tedious for those users, leading to bug reports.
2001-10-01 20:15:39 +00:00
Greg Stein
48d3438f5a Simplify the version handling some more by breaking the release process out
of the makefile into a separate script -- the script can do much more and
the makefile dependencies were not used anyways (just serving to obfuscate).
2001-08-23 13:26:37 +00:00
Greg Stein
a5e3cad879 Revamp how the version stuff is handled. Use the header file as the
original, and extract the numbers within the configure script.

* configure.in: extract the numbers from lib/expat.h

* Makefile.in: simplify the construction of DISTDIR

* lib/Makefile.in: no need to define the VERSION preprocessor symbol

* lib/expat.dsp: do not define VERSION (changed, but untested!)

* lib/xmlparse.c: revamp the XML_ExpatVersion() function

* lib/expat.h(.in): just ship the baby, rather than generating it
2001-08-23 12:35:53 +00:00
Greg Stein
33589a12bc * stop using aclocal.m4 and directly sinclude() the .m4 files into the
configure script. don't "clean" it and remove it from .cvsignore.
  Note: to avoid problems in developer dirs, we nuke the file in
  buildconf.sh for now; we'll stop doing that at some future time.
  [idea from ASF]

* look for glibtoolize, in addition to libtoolize (e.g. the MacOS X platform
  names it differently). [patch from ASF]

* conftools/missing is not needed

* use "exit 0" in buildconf.sh to help calling scripts. [patch from ASF]

* minor output cleanup in "make clean"
2001-08-23 11:27:26 +00:00
Greg Stein
866f6330cc Clean out some unused bits from the makefiles. Remove some of the recursion
and just do it from the top-level instead.
2001-08-23 09:24:45 +00:00
Fred L. Drake, Jr.
b48c6919bb Update so the tests will be run by "make check". 2001-08-17 19:23:02 +00:00
Fred L. Drake, Jr.
bea3e90921 Remove the sample directory; it is no longer used. 2001-07-26 21:57:57 +00:00
Fred L. Drake, Jr.
a6849ef2f1 Add xmlwf to the default build, since the install includes it. 2001-07-26 20:31:15 +00:00
Fred L. Drake, Jr.
3e5d0aa4a7 Some minor simplifications, and descend into fewer subdirs on "make install". 2001-07-25 15:12:00 +00:00
Fred L. Drake, Jr.
05d1fac780 Make sure all the makefiles have at least a dummy check target and
reasonable distclean and maintainer-clean targets.

This fixes the last part of SF bug #430942.
2001-07-25 03:05:22 +00:00
Fred L. Drake, Jr.
be106416dc Reduce the reliance on non-standard "tar" options. 2001-07-24 20:03:28 +00:00
Greg Stein
4232566291 Revamp config/build to keep generated files out of CVS (some libtool files
were out of date, and we've previously seen expat.h out of sync).

*) Use new script "buildconf.sh" to create the set of generated files
   (aclocal.m4, config.h.in, configure). This is intended to be used by
   developers (rerun when configure.in changes) and just before a release
   (releases include these outputs).

   Developers now need the "autoconf" and "libtool" packages.

*) config.h.in is now built by autoheader and includes bits from acconfig.h
   rather than manual construction/maintenance. (renamed from config.hin)

*) added conftools/PrintPath from the ASF; it is a portable "which"

*) added "extraclean" target to top-level Makefile to get rid of all
   generated files (return to pure CVS state; before buildconf.sh)

*) updates various bits for config.hin -> config.h.in rename

*) no longer need to delete the ".deps" subdir since we don't create it
   anymore (dependencies are explicit rather than auto-generated).
2001-03-10 15:41:50 +00:00
Fred L. Drake, Jr.
d47741fc6b Sam TH:
Fix a variety of build control problems for the auxiliary directories.

This closes SF tracker patch #403582.
2001-03-01 04:28:27 +00:00
Clark Cooper
01947d98ff Inadvertently failed to commit these files for 1.95.1 (apparently I committed
from the lib directory instead of the main directory)
2000-12-27 18:08:15 +00:00
Clark Cooper
205ac2c5d9 Fixed a bug in Makefile.in that wiped out README. 2000-09-29 15:44:00 +00:00
Clark Cooper
aa45fb851a Versioning information, fill in Changes file, possible final commit before
first release (1.95.0)
2000-09-29 14:57:45 +00:00
Clark Cooper
63d2f68760 Switch to using MANIFEST to build distribution.
Also fix xmlwf to use current entity declaration signature.
2000-09-28 19:47:35 +00:00
Clark Cooper
c446fb274e Merged in modifications from perl-expat. Also fiddled around with more
configuration issues.
2000-09-21 21:20:18 +00:00
Clark Cooper
c135be083d These are the first check-ins for the libexpat task: create configuration
files and setup for building a shareable libexpat.
2000-09-18 16:26:23 +00:00