forks/tftp-hpa-google
1
0
Fork 0
forked from mirrors/tftp-hpa-google
Code Pull requests Releases 1 Activity

Makefile/configure cleanups; prepare for release

Browse source
This commit is contained in:
hpa 2004-01-08 20:48:51 +00:00
parent 9c3ab465f2
commit d05bd6fa96
4 changed files with 35 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

16
CHANGES
View file

@ -4,6 +4,22 @@ Changes in 0.35:
Add an option to control the maximum value of blksize
negotiated.
Removed workaround for obsolete Cygwin problem.
Don't use getopt() -- the -c option doesn't work correctly
since it depends on the ordering of arguments and options. It
is now possible to do:
tftp -m binary hostname -c get filename
This was previous possible by doing:
tftp -m binary -c get hostname:filename
... but it seemed that was counterintuitive to people.
Somewhat improved configure scripts.
Changes in 0.34:
Additional Solaris gcc compiler bug workarounds; these

28
Makefile
View file

@ -3,10 +3,10 @@
SUB = lib tftp tftpd
%.build: MCONFIG acconfig.h version.h
%.build: MCONFIG aconfig.h version.h
$(MAKE) -C $(patsubst %.build, %, $@)
%.install: MCONFIG acconfig.h version.h
%.install: MCONFIG aconfig.h version.h
$(MAKE) -C $(patsubst %.install, %, $@) install
%.clean:
@ -30,36 +30,40 @@ localclean:
distclean: localdistclean $(patsubst %, %.distclean, $(SUB))
localdistclean: localclean
rm -f MCONFIG config.status config.log acconfig.h *~ \#*
rm -f MCONFIG config.status config.log aconfig.h *~ \#*
rm -rf *.cache
find . -type f \( -name \*.orig -o -name \*.rej \) | xargs rm -f
spotless: distclean
rm -f configure acconfig.h.in
rm -f configure aconfig.h.in
autoconf: configure acconfig.h.in
autoconf: configure aconfig.h.in
config: MCONFIG acconfig.h
config: MCONFIG aconfig.h
release:
$(MAKE) autoconf
$(MAKE) distclean
MCONFIG: configure MCONFIG.in acconfig.h.in
if test -x config.status; then ./config.status; else ./configure; fi
MCONFIG: configure MCONFIG.in aconfig.h.in
if test -x config.status; then \
./config.status --recheck && ./config.status ; \
else \
./configure ; \
fi
acconfig.h: MCONFIG
aconfig.h: MCONFIG
: Generated by side effect
# Adding "configure" to the dependencies serializes this with running
# autoconf, because there are apparently race conditions between
# autoconf and autoheader.
acconfig.h.in: configure.in configure aclocal.m4
rm -f acconfig.h.in acconfig.h
aconfig.h.in: configure.in configure aclocal.m4
rm -f aconfig.h.in aconfig.h
autoheader
configure: configure.in aclocal.m4
rm -f MCONFIG configure config.log acconfig.h config.cache
rm -rf MCONFIG configure config.log aconfig.h *.cache
autoconf
version.h: version

2
config.h
View file

@ -19,7 +19,7 @@
#define CONFIG_H 1
/* Must be included before we include any system headers! */
#include "acconfig.h"
#include "aconfig.h" /* autogenerated configuration header */
/* Standard includes */

4
configure.in
View file

@ -14,7 +14,7 @@ AC_PROG_CC
dnl
dnl Feature-test macros. These need to be set in CFLAGS, rather in
dnl acconfig.h, or "configure" will run in a different environment than
dnl aconfig.h, or "configure" will run in a different environment than
dnl we eventually we build in.
dnl
@ -201,5 +201,5 @@ AC_PROG_LN_S
AC_PROG_RANLIB
AC_PROG_INSTALL
AC_CONFIG_HEADERS(acconfig.h)
AC_CONFIG_HEADERS(aconfig.h)
AC_OUTPUT(MCONFIG)