avr
/
avrdude
mirror of https://github.com/mariusgreuel/avrdude.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Make a first attempt to build a shared library (not to be installed by 

now).



git-svn-id: svn://svn.savannah.nongnu.org/avrdude/trunk/avrdude@1304 81a1dc3b-b13d-400b-aceb-764788c761c2
This commit is contained in:
Joerg Wunsch 2014-05-16 17:50:40 +00:00
parent 96647f1486
commit 52dd5cc7ac
4 changed files with 16 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -1,3 +1,9 @@
2014-05-16 Joerg Wunsch <j.gnu@uriah.heep.sax.de>
* configure.ac: Bump version, add libtool hooks
* Makefile.am: First attempt to define building a shared library
(not to be installed by now)
2014-05-16 Joerg Wunsch <j.gnu@uriah.heep.sax.de> 2014-05-16 Joerg Wunsch <j.gnu@uriah.heep.sax.de>
* dfu.c (dfu_open, dfu_init): Fix signature of the dummy functions * dfu.c (dfu_open, dfu_init): Fix signature of the dummy functions

5
Makefile.am
View File

@ -59,16 +59,19 @@ AM_YFLAGS = -d
avrdude_CPPFLAGS = -DCONFIG_DIR=\"$(sysconfdir)\" avrdude_CPPFLAGS = -DCONFIG_DIR=\"$(sysconfdir)\"
libavrdude_a_CPPFLAGS = -DCONFIG_DIR=\"$(sysconfdir)\" libavrdude_a_CPPFLAGS = -DCONFIG_DIR=\"$(sysconfdir)\"
libavrdude_la_CPPFLAGS = $(libavrdude_a_CPPFLAGS)
avrdude_CFLAGS = @ENABLE_WARNINGS@ avrdude_CFLAGS = @ENABLE_WARNINGS@
libavrdude_a_CFLAGS = @ENABLE_WARNINGS@ libavrdude_a_CFLAGS = @ENABLE_WARNINGS@
libavrdude_la_CFLAGS = $(libavrdude_a_CFLAGS)
avrdude_LDADD = $(top_builddir)/$(noinst_LIBRARIES) @LIBUSB_1_0@ @LIBUSB@ @LIBFTDI1@ @LIBFTDI@ @LIBHID@ @LIBELF@ @LIBPTHREAD@ -lm avrdude_LDADD = $(top_builddir)/$(noinst_LIBRARIES) @LIBUSB_1_0@ @LIBUSB@ @LIBFTDI1@ @LIBFTDI@ @LIBHID@ @LIBELF@ @LIBPTHREAD@ -lm
bin_PROGRAMS = avrdude bin_PROGRAMS = avrdude
noinst_LIBRARIES = libavrdude.a noinst_LIBRARIES = libavrdude.a
noinst_LTLIBRARIES = libavrdude.la
# 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
@ -182,6 +185,8 @@ libavrdude_a_SOURCES = \
update.c \ update.c \
wiring.h \ wiring.h \
wiring.c wiring.c
libavrdude_la_SOURCES = $(libavrdude_a_SOURCES)
libavrdude_la_LDFLAGS = -version-info 1:0
avrdude_SOURCES = \ avrdude_SOURCES = \
main.c \ main.c \

2
bootstrap
View File

@ -13,6 +13,8 @@ set -x
rm -rf autom4te.cache rm -rf autom4te.cache
libtoolize
${ACLOCAL} ${ACLOCAL}
${AUTOHEADER} ${AUTOHEADER}
${AUTOCONF} ${AUTOCONF}

8
configure.ac
View File

@ -23,7 +23,7 @@
# Process this file with autoconf to produce a configure script. # Process this file with autoconf to produce a configure script.
AC_PREREQ(2.60) AC_PREREQ(2.60)
AC_INIT(avrdude, 6.1-20140313, avrdude-dev@nongnu.org) AC_INIT(avrdude, 6.1-20140516, avrdude-dev@nongnu.org)
AC_CANONICAL_BUILD AC_CANONICAL_BUILD
AC_CANONICAL_HOST AC_CANONICAL_HOST
@ -33,16 +33,14 @@ AC_CONFIG_SRCDIR([main.c])
AM_INIT_AUTOMAKE AM_INIT_AUTOMAKE
AC_CONFIG_HEADERS(ac_cfg.h) AC_CONFIG_HEADERS(ac_cfg.h)
LT_INIT()
# Checks for programs. # Checks for programs.
AC_PROG_CC AC_PROG_CC
AC_PROG_INSTALL AC_PROG_INSTALL
AC_PROG_SED AC_PROG_SED
AC_PROG_YACC AC_PROG_YACC
AC_PROG_LEX AC_PROG_LEX
AN_MAKEVAR([RANLIB], [AC_PROG_RANLIB])
AN_PROGRAM([ranlib], [AC_PROG_RANLIB])
AC_DEFUN([AC_PROG_RANLIB], [AC_CHECK_TARGET_TOOL(RANLIB, ranlib, :)])
AC_PROG_RANLIB
AN_MAKEVAR([AR], [AC_PROG_AR]) AN_MAKEVAR([AR], [AC_PROG_AR])
AN_PROGRAM([ar], [AC_PROG_AR]) AN_PROGRAM([ar], [AC_PROG_AR])
AC_DEFUN([AC_PROG_AR], [AC_CHECK_TARGET_TOOL(AR, ar, :)]) AC_DEFUN([AC_PROG_AR], [AC_CHECK_TARGET_TOOL(AR, ar, :)])