Commit Graph

210 Commits

Author SHA1 Message Date
Sebastian Huber
a40bb03d72 build: Merge zlib/Makefile.am 2018-10-10 07:55:12 +02:00
Chris Johns
2afb22b7e1 Remove make preinstall
A speciality of the RTEMS build system was the make preinstall step.  It
copied header files from arbitrary locations into the build tree.  The
header files were included via the -Bsome/build/tree/path GCC command
line option.

This has at least seven problems:

* The make preinstall step itself needs time and disk space.

* Errors in header files show up in the build tree copy.  This makes it
  hard for editors to open the right file to fix the error.

* There is no clear relationship between source and build tree header
  files.  This makes an audit of the build process difficult.

* The visibility of all header files in the build tree makes it
  difficult to enforce API barriers.  For example it is discouraged to
  use BSP-specifics in the cpukit.

* An introduction of a new build system is difficult.

* Include paths specified by the -B option are system headers.  This
  may suppress warnings.

* The parallel build had sporadic failures on some hosts.

This patch removes the make preinstall step.   All installed header
files are moved to dedicated include directories in the source tree.
Let @RTEMS_CPU@ be the target architecture, e.g. arm, powerpc, sparc,
etc.  Let @RTEMS_BSP_FAMILIY@ be a BSP family base directory, e.g.
erc32, imx, qoriq, etc.

The new cpukit include directories are:

* cpukit/include

* cpukit/score/cpu/@RTEMS_CPU@/include

* cpukit/libnetworking

The new BSP include directories are:

* bsps/include

* bsps/@RTEMS_CPU@/include

* bsps/@RTEMS_CPU@/@RTEMS_BSP_FAMILIY@/include

There are build tree include directories for generated files.

The include directory order favours the most general header file, e.g.
it is not possible to override general header files via the include path
order.

The "bootstrap -p" option was removed.  The new "bootstrap -H" option
should be used to regenerate the "headers.am" files.

Update #3254.
2018-01-25 08:45:26 +01:00
Sebastian Huber
d19e7aab4b zlib: Fix build
Update #3254.
2017-12-13 09:32:11 +01:00
Sebastian Huber
241fc046a7 zlib: Do not generate zconf.h
Update #3254.
2017-12-13 09:25:55 +01:00
Chris Johns
59990cc975 Regenerate all preinstall.am files.
With this patch the preinstall.am files are in a set order and not
dependent on now perl implements a hash.
2014-08-29 12:48:01 +10:00
Joel Sherrill
b597c0d60c Regenerate all preinstall.am files.
Apparently, at some point automake output changed and these were
not updated.
2014-08-28 08:44:52 -05:00
Gedare Bloom
fad2d38a9f RTEMS: Delete ChangeLog files.
This commit deletes all RTEMS ChangeLog files. These files have been abandoned
since converting to git version control. The historical data may be recovered
by checking out any commit before this one. Most of the contents of these
ChangeLog files can also be found in the git log.

Two external ChangeLog files, ChangeLog.slac and ChangeLog.zlib, remain.
2013-03-08 15:55:06 -05:00
Joel Sherrill
9b4422a251 Remove All CVS Id Strings Possible Using a Script
Script does what is expected and tries to do it as
smartly as possible.

+ remove occurrences of two blank comment lines
  next to each other after Id string line removed.
+ remove entire comment blocks which only exited to
  contain CVS Ids
+ If the processing left a blank line at the top of
  a file, it was removed.
2012-05-11 08:44:13 -05:00
Joel Sherrill
33a105fb69 Revert: Remove CVS Ids
See http://www.rtems.org/pipermail/rtems-devel/2012-May/001006.html
for details.
2012-05-07 11:08:48 -05:00
Ralf Corsépius
ee32f67a6f Remove CVS-Ids. 2012-05-04 09:36:25 +02:00
Joel Sherrill
61250b4ce9 Remove all .cvsignore files. 2012-02-01 10:59:44 -06:00
Ralf Corsepius
05547fef75 Regenerate. 2011-03-19 07:44:05 +00:00
Ralf Corsepius
471cd03e57 2011-03-19 Ralf Corsépius <ralf.corsepius@rtems.org>
* ChangeLog.zlib, adler32.c, compress.c, crc32.c,
	deflate.c, deflate.h, gzguts.h, gzlib.c, gzread.c,
	inffast.c, inffast.h, inftrees.c, inftrees.h,
	trees.c, trees.h, uncompr.c, zlib.h, zutil.c, zutil.h:
	Update to zlib-1.2.5.
	* Makefile.am: Generate zconf.h from zconf.h.in.
	* treebuild.xml, zconf.h.cmakein, zconf.h:
	Remove (Import cleanup).
2011-03-19 07:43:56 +00:00
Ralf Corsepius
f74497550e Remove (Import cleanup). 2011-03-19 07:43:27 +00:00
Ralf Corsepius
89130ece97 Generate zconf.h from zconf.h.in. 2011-03-19 07:43:11 +00:00
Ralf Corsepius
791d3cdcf7 Update to zlib-1.2.5. 2011-03-19 07:42:49 +00:00
Ralf Corsepius
fad4d97397 2011-03-18 Ralf Corsépius <ralf.corsepius@rtems.org>
* win32/README-WIN32.txt, old/visualc6/README.txt,
	old/visualc6/example.dsp, old/visualc6/minigzip.dsp,
	old/visualc6/zlib.dsp, old/visualc6/zlib.dsw:
	Remove (Import cleanup.).
2011-03-18 16:56:24 +00:00
Ralf Corsepius
979364c8de Remove (Import cleanup.). 2011-03-18 16:56:09 +00:00
Ralf Corsepius
6b14370de7 2011-03-18 Ralf Corsépius <ralf.corsepius@rtems.org>
* CMakeLists.txt, INDEX, zlib.3.pdf, zlib.3, zlib.map,
	zlib.pc.in, zlib2ansi: Remove (Import cleanup.)
2011-03-18 14:48:51 +00:00
Ralf Corsepius
9214a2b9d7 Remove (Import cleanup). 2011-03-18 14:48:44 +00:00
Ralf Corsepius
e396f2b689 2011-03-18 Ralf Corsépius <ralf.corsepius@rtems.org>
* nintendods/Makefile, nintendods/README,
	old/as400/readme.txt, old/as400/zlib.inc, old/as400/bndsrc
	old/as400/compile.clp,
	watcom/watcom_l.mak, watcom/watcom_f.mak,
	examples/enough.c, examples/zran.c, examples/gun.c:
	Remove (Import cleanup.).
2011-03-18 14:45:13 +00:00
Ralf Corsepius
ec01695d4c 2011-03-18 Ralf Corsépius <ralf.corsepius@rtems.org>
* contrib/masmx86/match686.asm, contrib/gcc_gvmat64/gvmat64.S,
	contrib/vstudio/vc10/zlibvc.def,
	contrib/vstudio/vc10/miniunz.vcxproj.user,
	contrib/vstudio/vc10/minizip.vcxproj.filters,
	contrib/vstudio/vc10/testzlib.vcxproj.filters,
	contrib/vstudio/vc10/zlibvc.sln,
	contrib/vstudio/vc10/miniunz.vcxproj.filters,
	contrib/vstudio/vc10/zlibvc.vcxproj,
	contrib/vstudio/vc10/zlibvc.vcxproj.user,
	contrib/vstudio/vc10/testzlib.vcxproj.user,
	contrib/vstudio/vc10/zlib.rc,
	contrib/vstudio/vc10/minizip.vcxproj,
	contrib/vstudio/vc10/testzlibdll.vcxproj,
	contrib/vstudio/vc10/testzlibdll.vcxproj.filters,
	contrib/vstudio/vc10/zlibstat.vcxproj.filters,
	contrib/vstudio/vc10/zlibvc.vcxproj.filters,
	contrib/vstudio/vc10/testzlib.vcxproj,
	contrib/vstudio/vc10/testzlibdll.vcxproj.user,
	contrib/vstudio/vc10/zlibstat.vcxproj.user,
	contrib/vstudio/vc10/miniunz.vcxproj,
	contrib/vstudio/vc10/minizip.vcxproj.user,
	contrib/vstudio/vc10/zlibstat.vcxproj,
	contrib/vstudio/vc9/zlibvc.def,
	contrib/vstudio/vc9/miniunz.vcproj,
	contrib/vstudio/vc9/testzlib.vcproj,
	contrib/vstudio/vc9/zlibvc.sln,
	contrib/vstudio/vc9/zlibstat.vcproj,
	contrib/vstudio/vc9/zlibvc.vcproj,
	contrib/vstudio/vc9/zlib.rc,
	contrib/vstudio/vc9/minizip.vcproj,
	contrib/vstudio/vc9/testzlibdll.vcproj,
	contrib/amd64/amd64-match.S,
	contrib/minizip/make_vms.com,
	contrib/minizip/MiniZip64_info.txt,
	contrib/minizip/MiniZip64_Changes.txt:
	Remove (Import cleanup.).
2011-03-18 14:43:19 +00:00
Ralf Corsepius
3db30a68ad This commit was generated by cvs2svn to compensate for changes in r25214,
which included commits to RCS files with non-trunk default branches.
2011-03-18 10:11:48 +00:00
Ralf Corsepius
4f05dd91a9 Import from zlib-1.2.5 2011-03-18 10:11:48 +00:00
Ralf Corsepius
c80c2f2b04 This commit was generated by cvs2svn to compensate for changes in r25212,
which included commits to RCS files with non-trunk default branches.
2011-03-18 10:11:47 +00:00
Ralf Corsepius
c29ecea5a9 Import from zlib-1.2.5 2011-03-18 10:11:47 +00:00
Ralf Corsepius
bf6f9b3dca Import from zlib-1.2.5 2011-03-18 10:11:46 +00:00
Ralf Corsepius
8e0d0c7447 Import from zlib-1.2.5 2011-03-18 10:11:45 +00:00
Ralf Corsepius
d0df2d5526 This commit was generated by cvs2svn to compensate for changes in r25208,
which included commits to RCS files with non-trunk default branches.
2011-03-18 10:11:44 +00:00
Ralf Corsepius
6557362411 Import from zlib-1.2.5 2011-03-18 10:11:44 +00:00
Ralf Corsepius
47a619ae94 Import from zlib-1.2.5 2011-03-18 10:11:43 +00:00
Ralf Corsepius
3d7bcc72eb 2010-04-09 Ralf Corsépius <ralf.corsepius@rtems.org>
* zconf.h: Regenerate by zlib's configure.
	Eliminate HAVE_UNISTD_H. Use Z_PREFIX.
2011-03-18 10:11:40 +00:00
Joel Sherrill
8b631ccdc3 2010-03-28 Joel Sherrill <joel.sherrill@oarcorp.com>
* zconf.h: Add include of config.h
2011-03-18 10:11:39 +00:00
Ralf Corsepius
43b1d3af77 Import from zlib-1.2.5 2011-03-18 10:11:38 +00:00
Thomas Doerfler
28947389ae Make code match prototype to eliminate warnings.
eliminate unneeded comilation of 64 bit functions
2011-03-18 10:11:37 +00:00
Ralf Corsepius
94a2eccb2a Import from zlib-1.2.4 2011-03-18 10:11:35 +00:00
Ralf Corsepius
a9503cc97c This commit was generated by cvs2svn to compensate for changes in r25198,
which included commits to RCS files with non-trunk default branches.
2011-03-18 10:11:35 +00:00
Ralf Corsepius
416fb2bad4 Import from zlib-1.2.4 2011-03-18 10:11:34 +00:00
cvs2git
b40c451c06 This commit was manufactured by cvs2svn to create branch 'zlib'.
Cherrypick from master 2011-03-18 10:11:29 UTC Joel Sherrill <joel.sherrill@OARcorp.com> '2010-03-22	Joel Sherrill <joel.sherrill@oarcorp.com>':
    cpukit/zlib/doc/algorithm.txt
    cpukit/zlib/gzclose.c
    cpukit/zlib/gzguts.h
    cpukit/zlib/gzlib.c
    cpukit/zlib/gzread.c
    cpukit/zlib/gzwrite.c
2011-03-18 10:11:30 +00:00
Joel Sherrill
6121dc7736 2010-03-22 Joel Sherrill <joel.sherrill@oarcorp.com>
* ChangeLog.zlib, FAQ, Makefile.am, README, adler32.c, compress.c,
	crc32.c, deflate.c, deflate.h, infback.c, inffast.c, inflate.c,
	inflate.h, inftrees.c, inftrees.h, trees.c, uncompr.c, zconf.h,
	zlib.3, zlib.h, zutil.c, zutil.h: Update to zlib 1.2.4.
	* gzclose.c, gzguts.h, gzlib.c, gzread.c, gzwrite.c, doc/algorithm.txt:
	New files.
	* algorithm.txt, gzio.c: Removed.
2011-03-18 10:11:29 +00:00
Ralf Corsepius
e215a4e125 Import from zlib-1.2.4 2011-03-18 10:11:28 +00:00
Ralf Corsepius
41ca776ff7 This commit was generated by cvs2svn to compensate for changes in r25189,
which included commits to RCS files with non-trunk default branches.
2011-03-18 10:11:27 +00:00
Ralf Corsepius
4b06f71a64 Import from zlib-1.2.4 2011-03-18 10:11:27 +00:00
Ralf Corsepius
f82036a537 Import from zlib-1.2.4 2011-03-18 10:11:26 +00:00
Ralf Corsepius
fb25694c53 Import from zlib-1.2.4 2011-03-18 10:11:25 +00:00
Ralf Corsepius
815842105c Import from zlib-1.2.4 2011-03-18 10:11:24 +00:00
Ralf Corsepius
657322fd55 Import from zlib-1.2.4 2011-03-18 10:11:23 +00:00
Ralf Corsepius
a23ac5f4c2 This commit was generated by cvs2svn to compensate for changes in r25183,
which included commits to RCS files with non-trunk default branches.
2011-03-18 10:11:22 +00:00
Ralf Corsepius
d71b3a779f Import from zlib-1.2.4 2011-03-18 10:11:22 +00:00
Ralf Corsepius
5a7aa101be Import from zlib-1.2.4 2011-03-18 10:11:21 +00:00