Rearrange everything so it is now built into a libavrdude.a library,

and link main.c against that library.

Add AC_PROG_RANLIB to configure.ac as we are building a library now.


git-svn-id: svn://svn.savannah.nongnu.org/avrdude/trunk/avrdude@723 81a1dc3b-b13d-400b-aceb-764788c761c2
This commit is contained in:
Joerg Wunsch 2007-01-25 20:51:11 +00:00
parent 5bf9e2d9f2
commit 6e1e55406f
4 changed files with 24 additions and 4 deletions

View File

@ -1,3 +1,10 @@
2007-01-25 Joerg Wunsch <j@uriah.heep.sax.de>
* Makefile.am: Rearrange everything so it is now built into a
libavrdude.a library, and link main.c against that library.
* configure.ac: Add AC_PROG_RANLIB as we are building a library
now.
2007-01-24 Joerg Wunsch <j@uriah.heep.sax.de> 2007-01-24 Joerg Wunsch <j@uriah.heep.sax.de>
Major code cleanup. Major code cleanup.

View File

@ -45,12 +45,18 @@ AM_YFLAGS = -d
avrdude_CPPFLAGS = -DCONFIG_DIR=\"$(sysconfdir)\" avrdude_CPPFLAGS = -DCONFIG_DIR=\"$(sysconfdir)\"
libavrdude_a_CPPFLAGS = -DCONFIG_DIR=\"$(sysconfdir)\"
avrdude_CFLAGS = @ENABLE_WARNINGS@ avrdude_CFLAGS = @ENABLE_WARNINGS@
avrdude_LDADD = @LIBUSB@ @LIBHID@ libavrdude_a_CFLAGS = @ENABLE_WARNINGS@
avrdude_LDADD = $(top_builddir)/$(noinst_LIBRARIES) @LIBUSB@ @LIBHID@
bin_PROGRAMS = avrdude bin_PROGRAMS = avrdude
noinst_LIBRARIES = libavrdude.a
# automake thinks these generated files should be in the distribution, # automake thinks these generated files should be in the distribution,
# but this might cause trouble for some users, so we rather don't want # but this might cause trouble for some users, so we rather don't want
# to have them there. # to have them there.
@ -66,7 +72,7 @@ dist-hook:
$(distdir)/config_gram.c \ $(distdir)/config_gram.c \
$(distdir)/config_gram.h $(distdir)/config_gram.h
avrdude_SOURCES = \ libavrdude_a_SOURCES = \
config_gram.y \ config_gram.y \
lexer.l \ lexer.l \
avr.c \ avr.c \
@ -98,7 +104,6 @@ avrdude_SOURCES = \
linux_ppdev.h \ linux_ppdev.h \
lists.c \ lists.c \
lists.h \ lists.h \
main.c \
my_ddk_hidsdi.h \ my_ddk_hidsdi.h \
par.c \ par.c \
par.h \ par.h \
@ -135,6 +140,9 @@ avrdude_SOURCES = \
update.h \ update.h \
update.c update.c
avrdude_SOURCES = \
main.c
man_MANS = avrdude.1 man_MANS = avrdude.1
sysconf_DATA = avrdude.conf sysconf_DATA = avrdude.conf

4
NEWS
View File

@ -9,6 +9,10 @@ Current:
* Bugfixes. * Bugfixes.
* Source code rearranged so that the functionality is now built
into a libavrdude.a library where main.c is currently the only
existing frontend.
Version 5.3.1: Version 5.3.1:
* Add support for the AVR Dragon (all modes: ISP, JTAG, HVSP, PP, * Add support for the AVR Dragon (all modes: ISP, JTAG, HVSP, PP,

View File

@ -39,6 +39,7 @@ AC_PROG_CC
AC_PROG_INSTALL AC_PROG_INSTALL
AC_PROG_YACC AC_PROG_YACC
AM_PROG_LEX AM_PROG_LEX
AC_PROG_RANLIB
# Checks for libraries. # Checks for libraries.
AC_CHECK_LIB([termcap], [tputs]) AC_CHECK_LIB([termcap], [tputs])