* A lot of Makefile.am updates to try to get 'make dist' and 'make distcheck'
to work as expected.
This commit is contained in:
parent
3b95de655b
commit
3595201f5f
|
@ -1,9 +1,9 @@
|
||||||
SUBDIRS = lib/libalpm src/util src/pacman scripts doc etc
|
SUBDIRS = lib/libalpm src/util src/pacman scripts doc etc
|
||||||
|
|
||||||
EXTRA_DIST = \
|
# Some files automatically included, so they aren't specified below:
|
||||||
NEWS \
|
# AUTHORS, COPYING, NEWS, README
|
||||||
COPYING \
|
# TODO: move translation-help to ABOUT-NLS?
|
||||||
README
|
EXTRA_DIST = HACKING
|
||||||
|
|
||||||
check: src/pacman
|
check: src/pacman
|
||||||
cd pactest; python pactest.py --test=tests/*.py -p ../src/pacman/pacman --debug=1
|
cd pactest; python pactest.py --test=tests/*.py -p ../src/pacman/pacman --debug=1
|
||||||
|
|
2
TODO.dan
2
TODO.dan
|
@ -86,6 +86,8 @@ differ here.
|
||||||
Rewrite makepkg to use terminal-safe coloring/bolding. tput utility should
|
Rewrite makepkg to use terminal-safe coloring/bolding. tput utility should
|
||||||
allow us to do this.
|
allow us to do this.
|
||||||
|
|
||||||
|
Bugs/FRs to smash: 6468, 6437, 6430?, 6420, 6404, 6389, 6312?, 6284, 6273?, 6255?, 6208, 5987, 5885, 5571, 4182, 3492, 2810?, 1769, 1588, 1571
|
||||||
|
|
||||||
Other smaller things:
|
Other smaller things:
|
||||||
---------------------
|
---------------------
|
||||||
|
|
||||||
|
|
154
configure.ac
154
configure.ac
|
@ -11,16 +11,9 @@ AM_INIT_AUTOMAKE
|
||||||
AM_GNU_GETTEXT([external])
|
AM_GNU_GETTEXT([external])
|
||||||
AM_GNU_GETTEXT_VERSION(0.13.1)
|
AM_GNU_GETTEXT_VERSION(0.13.1)
|
||||||
|
|
||||||
dnl Host dependant flags
|
|
||||||
case "${host}" in
|
|
||||||
*-*-cygwin*)
|
|
||||||
ENV_CFLAGS="$ENV_CFLAGS -DCYGWIN"
|
|
||||||
;;
|
|
||||||
esac
|
|
||||||
|
|
||||||
dnl Define here the libalpm version number
|
dnl Define here the libalpm version number
|
||||||
PM_MAJOR_VERSION=0
|
PM_MAJOR_VERSION=1
|
||||||
PM_MINOR_VERSION=1
|
PM_MINOR_VERSION=0
|
||||||
PM_MICRO_VERSION=0
|
PM_MICRO_VERSION=0
|
||||||
PM_VERSION=$PM_MAJOR_VERSION.$PM_MINOR_VERSION.$PM_MICRO_VERSION
|
PM_VERSION=$PM_MAJOR_VERSION.$PM_MINOR_VERSION.$PM_MICRO_VERSION
|
||||||
dnl Needed for libtool to create proper shared lib version
|
dnl Needed for libtool to create proper shared lib version
|
||||||
|
@ -59,70 +52,9 @@ AC_ARG_ENABLE(doxygen,
|
||||||
AC_HELP_STRING([--disable-doxygen], [Build API docs via Doxygen]),
|
AC_HELP_STRING([--disable-doxygen], [Build API docs via Doxygen]),
|
||||||
[wantdoxygen=$enableval], [wantdoxygen=yes])
|
[wantdoxygen=$enableval], [wantdoxygen=yes])
|
||||||
|
|
||||||
dnl Check for architecture
|
|
||||||
case "$host" in
|
|
||||||
i686-*) AC_DEFINE_UNQUOTED([CARCH], ["i686"], [Architecture])
|
|
||||||
AC_DEFINE_UNQUOTED([CARCHFLAGS], ["i686"], [Architecture])
|
|
||||||
AC_DEFINE_UNQUOTED([ARCHSWITCH], ["march"], [Architecture])
|
|
||||||
CARCH="i686"
|
|
||||||
CARCHFLAGS="i686"
|
|
||||||
ARCHSWITCH="march"
|
|
||||||
CHOST="${host}"
|
|
||||||
;;
|
|
||||||
x86_64-*) AC_DEFINE_UNQUOTED([CARCH], ["x86_64"], [Architecture])
|
|
||||||
AC_DEFINE_UNQUOTED([CARCHFLAGS], ["x86-64"], [Architecture])
|
|
||||||
AC_DEFINE_UNQUOTED([ARCHSWITCH], ["march"], [Architecture])
|
|
||||||
CARCH="x86_64"
|
|
||||||
CARCHFLAGS="x86-64"
|
|
||||||
ARCHSWITCH="march"
|
|
||||||
CHOST="${host}"
|
|
||||||
;;
|
|
||||||
ia64-*) AC_DEFINE_UNQUOTED([CARCH], ["ia64"], [Architecture])
|
|
||||||
AC_DEFINE_UNQUOTED([CARCHFLAGS], ["ia64"], [Architecture])
|
|
||||||
AC_DEFINE_UNQUOTED([ARCHSWITCH], ["march"], [Architecture])
|
|
||||||
CARCH="ia64"
|
|
||||||
CARCHFLAGS="ia64"
|
|
||||||
ARCHSWITCH="march"
|
|
||||||
CHOST="${host}"
|
|
||||||
;;
|
|
||||||
sparc-*) AC_DEFINE_UNQUOTED([CARCH], ["sparc"], [Architecture])
|
|
||||||
AC_DEFINE_UNQUOTED([CARCHFLAGS], ["v9"], [Architecture])
|
|
||||||
AC_DEFINE_UNQUOTED([ARCHSWITCH], ["mcpu"], [Architecture])
|
|
||||||
CARCH="sparc"
|
|
||||||
CARCHFLAGS="v9"
|
|
||||||
ARCHSWITCH="mcpu"
|
|
||||||
CHOST="${host}"
|
|
||||||
;;
|
|
||||||
ppc-* | powerpc-*)
|
|
||||||
AC_DEFINE_UNQUOTED([CARCH], ["ppc"], [Architecture])
|
|
||||||
AC_DEFINE_UNQUOTED([CARCHFLAGS], ["750"], [Architecture])
|
|
||||||
AC_DEFINE_UNQUOTED([ARCHSWITCH], ["mcpu"], [Architecture])
|
|
||||||
CARCH="ppc"
|
|
||||||
CARCHFLAGS="750"
|
|
||||||
ARCHSWITCH="mcpu"
|
|
||||||
CHOST="${host}"
|
|
||||||
;;
|
|
||||||
i386-*) AC_DEFINE_UNQUOTED([CARCH], ["i386"], [Architecture])
|
|
||||||
AC_DEFINE_UNQUOTED([CARCHFLAGS], ["i386"], [Architecture])
|
|
||||||
AC_DEFINE_UNQUOTED([ARCHSWITCH], ["march"], [Architecture])
|
|
||||||
CARCH="i386"
|
|
||||||
CARCHFLAGS="i386"
|
|
||||||
ARCHSWITCH="march"
|
|
||||||
CHOST="${host}"
|
|
||||||
;;
|
|
||||||
*)
|
|
||||||
AC_MSG_ERROR([Your architecture is not supported])
|
|
||||||
;;
|
|
||||||
esac
|
|
||||||
|
|
||||||
AC_SUBST(CARCH)
|
|
||||||
AC_SUBST(CARCHFLAGS)
|
|
||||||
AC_SUBST(ARCHSWITCH)
|
|
||||||
AC_SUBST(CHOST)
|
|
||||||
|
|
||||||
dnl Help line for config file
|
dnl Help line for config file
|
||||||
AC_ARG_WITH(config-file,
|
AC_ARG_WITH(config-file,
|
||||||
AC_HELP_STRING([ --with-config-file=path], [Set the name and path for pacman's config file]),
|
AC_HELP_STRING([ --with-config-file=path], [Set the location of pacman's config file]),
|
||||||
[configfile=$withval], [configfile=/etc/pacman.conf])
|
[configfile=$withval], [configfile=/etc/pacman.conf])
|
||||||
|
|
||||||
dnl Help line for debug
|
dnl Help line for debug
|
||||||
|
@ -135,36 +67,94 @@ AC_ARG_ENABLE(fakeroot,
|
||||||
AC_HELP_STRING([--disable-fakeroot], [Disable fakeroot proof support]),
|
AC_HELP_STRING([--disable-fakeroot], [Disable fakeroot proof support]),
|
||||||
[fakeroot=$enableval], [fakeroot=yes])
|
[fakeroot=$enableval], [fakeroot=yes])
|
||||||
|
|
||||||
|
dnl Host dependant flags
|
||||||
|
case "${host}" in
|
||||||
|
*-*-cygwin*)
|
||||||
|
ENV_CFLAGS="$ENV_CFLAGS -DCYGWIN"
|
||||||
|
;;
|
||||||
|
esac
|
||||||
|
|
||||||
|
dnl Check for architecture
|
||||||
|
case "${host}" in
|
||||||
|
i686-*)
|
||||||
|
CARCH="i686"
|
||||||
|
CARCHFLAGS="i686"
|
||||||
|
ARCHSWITCH="march"
|
||||||
|
;;
|
||||||
|
x86_64-*)
|
||||||
|
CARCH="x86_64"
|
||||||
|
CARCHFLAGS="x86-64"
|
||||||
|
ARCHSWITCH="march"
|
||||||
|
;;
|
||||||
|
ia64-*)
|
||||||
|
CARCH="ia64"
|
||||||
|
CARCHFLAGS="ia64"
|
||||||
|
ARCHSWITCH="march"
|
||||||
|
;;
|
||||||
|
sparc-*)
|
||||||
|
CARCH="sparc"
|
||||||
|
CARCHFLAGS="v9"
|
||||||
|
ARCHSWITCH="mcpu"
|
||||||
|
;;
|
||||||
|
ppc-* | powerpc-*)
|
||||||
|
CARCH="ppc"
|
||||||
|
CARCHFLAGS="750"
|
||||||
|
ARCHSWITCH="mcpu"
|
||||||
|
;;
|
||||||
|
i386-*)
|
||||||
|
CARCH="i386"
|
||||||
|
CARCHFLAGS="i386"
|
||||||
|
ARCHSWITCH="march"
|
||||||
|
;;
|
||||||
|
*)
|
||||||
|
AC_MSG_ERROR([Your architecture is not supported])
|
||||||
|
;;
|
||||||
|
esac
|
||||||
|
|
||||||
|
dnl Now do some things common to all architectures
|
||||||
|
CHOST="${host}"
|
||||||
|
AC_DEFINE_UNQUOTED([CARCH], ["$CARCH"], [Architecture])
|
||||||
|
AC_DEFINE_UNQUOTED([CARCHFLAGS], ["$CARCHFLAGS"], [Architecture Flags])
|
||||||
|
AC_DEFINE_UNQUOTED([ARCHSWITCH], ["$ARCHSWITCH"], [Architecture Switch (march/mcpu)])
|
||||||
|
AC_DEFINE_UNQUOTED([CHOST], ["$CHOST"], [Host Type])
|
||||||
|
AC_SUBST(CARCH)
|
||||||
|
AC_SUBST(CARCHFLAGS)
|
||||||
|
AC_SUBST(ARCHSWITCH)
|
||||||
|
AC_SUBST(CHOST)
|
||||||
|
|
||||||
dnl Check for man2html binary
|
dnl Check for man2html binary
|
||||||
AC_MSG_CHECKING(for support man2html)
|
AC_MSG_CHECKING(for man2html)
|
||||||
if test x$wantman2html = xyes ; then
|
if test "x$wantman2html" = "xyes" ; then
|
||||||
AC_CHECK_PROGS([MAN2HTML], [man2html])
|
AC_CHECK_PROGS([MAN2HTML], [man2html])
|
||||||
AM_CONDITIONAL(HAS_MAN2HTML, test $MAN2HTML)
|
AM_CONDITIONAL(HAS_MAN2HTML, test $MAN2HTML)
|
||||||
if test $MAN2HTML ; then
|
if test $MAN2HTML ; then
|
||||||
AC_DEFINE([HAS_MAN2HTML], [TRUE], [Enabled HTML generation from man via man2html])
|
AC_DEFINE([HAS_MAN2HTML], [TRUE], [Enable HTML manpages using man2html])
|
||||||
AC_MSG_RESULT(yes)
|
AC_MSG_RESULT(yes)
|
||||||
else
|
else
|
||||||
AC_DEFINE([HAS_MAN2HTML], [FALSE], [Disabled HTML generation from man via man2html])
|
|
||||||
AC_MSG_RESULT(no, man2html missing)
|
AC_MSG_RESULT(no, man2html missing)
|
||||||
fi
|
fi
|
||||||
else
|
else
|
||||||
AM_CONDITIONAL(HAS_MAN2HTML, test $MAN2HTML)
|
AM_CONDITIONAL(HAS_MAN2HTML, false)
|
||||||
AC_DEFINE([HAS_MAN2HTML], [FALSE], [Not specified at configure line])
|
AC_MSG_RESULT(no, disabled by configure)
|
||||||
AC_MSG_RESULT(not requested by configure)
|
|
||||||
fi
|
fi
|
||||||
|
|
||||||
dnl Check for doxygen support
|
dnl Check for doxygen support
|
||||||
if test x$wantdoxygen = xyes ; then
|
AC_MSG_CHECKING(for doxygen)
|
||||||
|
if test "x$wantdoxygen" = "xyes" ; then
|
||||||
AC_CHECK_PROGS([DOXYGEN], [doxygen])
|
AC_CHECK_PROGS([DOXYGEN], [doxygen])
|
||||||
|
AM_CONDITIONAL(HAS_DOXYGEN, test $DOXYGEN)
|
||||||
if test $DOXYGEN ; then
|
if test $DOXYGEN ; then
|
||||||
DOXYSTATUS="yes, path: `which $DOXYGEN`"
|
DOXYSTATUS="yes, path: `which $DOXYGEN`"
|
||||||
|
AC_MSG_RESULT(yes)
|
||||||
else
|
else
|
||||||
DOXYSTATUS="doxygen binary not found"
|
DOXYSTATUS="doxygen binary not found"
|
||||||
|
AC_MSG_RESULT(no, doxygen missing)
|
||||||
fi
|
fi
|
||||||
else
|
else
|
||||||
|
AM_CONDITIONAL(HAS_DOXYGEN, false)
|
||||||
DOXYSTATUS="no, disabled by configure"
|
DOXYSTATUS="no, disabled by configure"
|
||||||
|
AC_MSG_RESULT(no, disabled by configure)
|
||||||
fi
|
fi
|
||||||
AM_CONDITIONAL(HAS_DOXYGEN, test $DOXYGEN)
|
|
||||||
|
|
||||||
dnl Check for math
|
dnl Check for math
|
||||||
AC_CHECK_LIB([m], [sqrt], [AC_CHECK_HEADER([math.h], [LIBM='-lm'])])
|
AC_CHECK_LIB([m], [sqrt], [AC_CHECK_HEADER([math.h], [LIBM='-lm'])])
|
||||||
|
@ -196,12 +186,12 @@ fi
|
||||||
dnl Enable or disable debug code
|
dnl Enable or disable debug code
|
||||||
AC_MSG_CHECKING(for debug mode request)
|
AC_MSG_CHECKING(for debug mode request)
|
||||||
if test "$debug" = "yes" ; then
|
if test "$debug" = "yes" ; then
|
||||||
AM_CONDITIONAL(PACMAN_DEBUG, test "$debug" = "yes")
|
AM_CONDITIONAL(PACMAN_DEBUG, test "x$debug" = "xyes")
|
||||||
CFLAGS="$CFLAGS -g -Wall -Werror -std=c99 -DPACMAN_DEBUG"
|
CFLAGS="$CFLAGS -g -Wall -Werror -std=c99 -DPACMAN_DEBUG"
|
||||||
LDFLAGS="$LDFLAGS -lmcheck"
|
LDFLAGS="$LDFLAGS -lmcheck"
|
||||||
AC_MSG_RESULT(yes)
|
AC_MSG_RESULT(yes)
|
||||||
else
|
else
|
||||||
AM_CONDITIONAL(PACMAN_DEBUG, test "$debug" = "no")
|
AM_CONDITIONAL(PACMAN_DEBUG, test "x$debug" = "xno")
|
||||||
CFLAGS="$CFLAGS -Wall -std=c99"
|
CFLAGS="$CFLAGS -Wall -std=c99"
|
||||||
AC_MSG_RESULT(no)
|
AC_MSG_RESULT(no)
|
||||||
fi
|
fi
|
||||||
|
|
|
@ -21,10 +21,14 @@ endif
|
||||||
clean:
|
clean:
|
||||||
rm -f html/*.html
|
rm -f html/*.html
|
||||||
rm -f man3/*.3
|
rm -f man3/*.3
|
||||||
rm -f man5/*.5
|
|
||||||
rm -f man8/*.8
|
|
||||||
|
|
||||||
man_MANS = pacman.8 makepkg.8 PKGBUILD.5 makepkg.conf.5 pacman.conf.5 libalpm.3
|
man_MANS = \
|
||||||
|
pacman.8 \
|
||||||
|
makepkg.8 \
|
||||||
|
PKGBUILD.5 \
|
||||||
|
makepkg.conf.5 \
|
||||||
|
pacman.conf.5 \
|
||||||
|
libalpm.3
|
||||||
|
|
||||||
if HAS_DOXYGEN
|
if HAS_DOXYGEN
|
||||||
man_MANS += *.3
|
man_MANS += *.3
|
||||||
|
|
|
@ -1,41 +1,42 @@
|
||||||
AUTOMAKE_OPTIONS = gnu
|
AUTOMAKE_OPTIONS = gnu
|
||||||
DEFINES = -pedantic -D_GNU_SOURCE
|
|
||||||
AM_CFLAGS = $(DEFINES)
|
|
||||||
SUBDIRS = po
|
SUBDIRS = po
|
||||||
|
|
||||||
|
lib_LTLIBRARIES = libalpm.la
|
||||||
|
include_HEADERS = alpm_list.h alpm.h
|
||||||
|
|
||||||
localedir = $(datadir)/locale
|
localedir = $(datadir)/locale
|
||||||
DEFS = -DLOCALEDIR=\"$(localedir)\" @DEFS@
|
DEFS = -DLOCALEDIR=\"$(localedir)\" @DEFS@
|
||||||
|
|
||||||
TARGETS = md5driver.c \
|
AM_CFLAGS = -pedantic -D_GNU_SOURCE $(CFLAGS)
|
||||||
md5.c \
|
|
||||||
sha1.c \
|
|
||||||
util.c \
|
|
||||||
alpm_list.c \
|
|
||||||
log.c \
|
|
||||||
error.c \
|
|
||||||
package.c \
|
|
||||||
group.c \
|
|
||||||
db.c \
|
|
||||||
cache.c \
|
|
||||||
conflict.c \
|
|
||||||
deps.c \
|
|
||||||
provide.c \
|
|
||||||
versioncmp.c \
|
|
||||||
backup.c \
|
|
||||||
trans.c \
|
|
||||||
add.c \
|
|
||||||
remove.c \
|
|
||||||
sync.c \
|
|
||||||
handle.c \
|
|
||||||
server.c \
|
|
||||||
alpm.c \
|
|
||||||
be_files.c
|
|
||||||
|
|
||||||
lib_LTLIBRARIES = libalpm.la
|
EXTRA_DIST = Doxyfile
|
||||||
|
|
||||||
include_HEADERS = alpm_list.h alpm.h
|
libalpm_la_SOURCES = \
|
||||||
|
add.h add.c \
|
||||||
libalpm_la_SOURCES = $(TARGETS)
|
alpm.h alpm.c \
|
||||||
|
alpm_list.h alpm_list.c \
|
||||||
|
backup.h backup.c \
|
||||||
|
be_files.c \
|
||||||
|
cache.h cache.c \
|
||||||
|
conflict.h conflict.c \
|
||||||
|
db.h db.c \
|
||||||
|
deps.h deps.c \
|
||||||
|
error.h error.c \
|
||||||
|
group.h group.c \
|
||||||
|
handle.h handle.c \
|
||||||
|
log.h log.c \
|
||||||
|
md5.h md5.c \
|
||||||
|
md5driver.c \
|
||||||
|
package.h package.c \
|
||||||
|
provide.h provide.c \
|
||||||
|
remove.h remove.c \
|
||||||
|
server.h server.c \
|
||||||
|
sha1.h sha1.c \
|
||||||
|
sync.h sync.c \
|
||||||
|
trans.h trans.c \
|
||||||
|
util.h util.c \
|
||||||
|
versioncmp.h versioncmp.c
|
||||||
|
|
||||||
libalpm_la_LDFLAGS = -no-undefined -version-info $(PM_VERSION_INFO)
|
libalpm_la_LDFLAGS = -no-undefined -version-info $(PM_VERSION_INFO)
|
||||||
libalpm_la_LIBADD = -larchive -ldownload -lm
|
libalpm_la_LIBADD = -larchive -ldownload -lm
|
||||||
|
|
|
@ -1,11 +1,15 @@
|
||||||
AUTOMAKE_OPTIONS = std-options
|
AUTOMAKE_OPTIONS = std-options
|
||||||
bin_SCRIPTS = gensync \
|
|
||||||
|
bin_SCRIPTS = \
|
||||||
|
abs \
|
||||||
|
gensync \
|
||||||
makepkg \
|
makepkg \
|
||||||
makeworld \
|
makeworld \
|
||||||
updatesync \
|
|
||||||
pacman-optimize \
|
pacman-optimize \
|
||||||
rankmirrors \
|
rankmirrors \
|
||||||
abs \
|
|
||||||
repo-add \
|
repo-add \
|
||||||
repo-remove \
|
repo-remove \
|
||||||
re-pacman
|
re-pacman \
|
||||||
|
updatesync
|
||||||
|
|
||||||
|
abs gensync makepkg makeworld pacman-optimize rankmirrors repo-add repo-remove re-pacman updatesync:
|
||||||
|
|
|
@ -1,25 +1,36 @@
|
||||||
|
SUBDIRS = po
|
||||||
|
|
||||||
bin_PROGRAMS = pacman
|
bin_PROGRAMS = pacman
|
||||||
|
|
||||||
if LINKSTATIC
|
if LINKSTATIC
|
||||||
bin_PROGRAMS += pacman.static
|
bin_PROGRAMS += pacman.static
|
||||||
endif
|
endif
|
||||||
|
|
||||||
SUBDIRS = po
|
|
||||||
|
|
||||||
localedir = $(datadir)/locale
|
localedir = $(datadir)/locale
|
||||||
DEFS = -DLOCALEDIR=\"$(localedir)\" @DEFS@
|
DEFS = -DLOCALEDIR=\"$(localedir)\" @DEFS@
|
||||||
|
INCLUDES = -I$(top_srcdir)/lib/libalpm
|
||||||
|
|
||||||
AM_CFLAGS = -D_GNU_SOURCE -I$(top_srcdir)/lib/libalpm $(CFLAGS)
|
AM_CFLAGS = -D_GNU_SOURCE $(CFLAGS)
|
||||||
|
|
||||||
pacman_SOURCES = util.c log.c package.c downloadprog.c trans.c add.c \
|
pacman_SOURCES = \
|
||||||
remove.c upgrade.c query.c sync.c conf.c deptest.c pacman.c
|
add.h add.c \
|
||||||
|
conf.h conf.c \
|
||||||
pacman_static_SOURCES = $(pacman_SOURCES)
|
deptest.h deptest.c \
|
||||||
|
downloadprog.h downloadprog.c \
|
||||||
|
log.h log.c \
|
||||||
|
package.h package.c \
|
||||||
|
pacman.c \
|
||||||
|
query.h query.c \
|
||||||
|
remove.h remove.c \
|
||||||
|
sync.h sync.c \
|
||||||
|
trans.h trans.c \
|
||||||
|
upgrade.h upgrade.c \
|
||||||
|
util.h util.c
|
||||||
|
|
||||||
pacman_LDADD = $(top_builddir)/lib/libalpm/.libs/libalpm.la \
|
pacman_LDADD = $(top_builddir)/lib/libalpm/.libs/libalpm.la \
|
||||||
-ldownload
|
-ldownload
|
||||||
|
|
||||||
|
pacman_static_SOURCES = $(pacman_SOURCES)
|
||||||
|
pacman_static_LDFLAGS = $(LDFLAGS) -all-static
|
||||||
pacman_static_LDADD = $(top_builddir)/lib/libalpm/.libs/libalpm.la \
|
pacman_static_LDADD = $(top_builddir)/lib/libalpm/.libs/libalpm.la \
|
||||||
-ldownload
|
-ldownload
|
||||||
|
|
||||||
pacman_static_LDFLAGS = $(LDFLAGS) -all-static
|
|
||||||
|
|
|
@ -21,6 +21,8 @@
|
||||||
#ifndef _PM_LOG_H
|
#ifndef _PM_LOG_H
|
||||||
#define _PM_LOG_H
|
#define _PM_LOG_H
|
||||||
|
|
||||||
|
/* TODO these are illegal in ISO C, thus the reason -pedantic was never used
|
||||||
|
* as a compile flag for the pacman side of things (named variadic macros) */
|
||||||
#define MSG(line, fmt, args...) pm_fprintf(stdout, line, fmt, ##args)
|
#define MSG(line, fmt, args...) pm_fprintf(stdout, line, fmt, ##args)
|
||||||
#define ERR(line, fmt, args...) do { \
|
#define ERR(line, fmt, args...) do { \
|
||||||
pm_fprintf(stderr, line, _("error: ")); \
|
pm_fprintf(stderr, line, _("error: ")); \
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
bin_PROGRAMS = vercmp testpkg
|
bin_PROGRAMS = vercmp testpkg
|
||||||
|
|
||||||
AM_CFLAGS = -I$(top_srcdir)/lib/libalpm
|
INCLUDES = -I$(top_srcdir)/lib/libalpm
|
||||||
|
|
||||||
vercmp_SOURCES = vercmp.c
|
vercmp_SOURCES = vercmp.c
|
||||||
vercmp_LDADD = $(top_builddir)/lib/libalpm/.libs/libalpm.so
|
vercmp_LDADD = $(top_builddir)/lib/libalpm/.libs/libalpm.so
|
||||||
|
|
Loading…
Reference in New Issue