NuKVM/libvirt
3
0
Fork 0
mirror of https://github.com/libvirt/libvirt.git synced 2025-02-25 18:55:26 -06:00
Code Issues Packages Projects Releases Wiki Activity

* configure.in libvirt.spec.in include/libvirt.h.in python/Makefile.am

Browse Source 
src/Makefile.am: fix rpm packaging problems whith head, more
  LIBVIR -> LIBVIRT changes.
Daniel
This commit is contained in:
Daniel Veillard
2006-02-15 13:21:17 +00:00
parent f32eee58b0
commit 2985f0acdb
7 changed files with 28 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@@ -1,3 +1,9 @@
Wed Feb 15 08:20:23 EST 2006 Daniel Veillard <veillard@redhat.com>
* configure.in libvirt.spec.in include/libvirt.h.in python/Makefile.am
src/Makefile.am: fix rpm packaging problems whith head, more
LIBVIR -> LIBVIRT changes.
Tue Feb 14 15:29:01 EST 2006 Daniel Veillard <veillard@redhat.com> Tue Feb 14 15:29:01 EST 2006 Daniel Veillard <veillard@redhat.com>
* Makefile.am configure.in python/Makefile.am python/tests/Makefile.am * Makefile.am configure.in python/Makefile.am python/tests/Makefile.am

32
configure.in
View File

@@ -3,33 +3,33 @@ AC_INIT(src/libvirt.c)
AM_CONFIG_HEADER(config.h) AM_CONFIG_HEADER(config.h)
AC_CANONICAL_HOST AC_CANONICAL_HOST
LIBVIR_MAJOR_VERSION=0 LIBVIRT_MAJOR_VERSION=0
LIBVIR_MINOR_VERSION=0 LIBVIRT_MINOR_VERSION=0
LIBVIR_MICRO_VERSION=4 LIBVIRT_MICRO_VERSION=4
LIBVIR_MICRO_VERSION_SUFFIX= LIBVIRT_MICRO_VERSION_SUFFIX=
LIBVIR_VERSION=$LIBVIR_MAJOR_VERSION.$LIBVIR_MINOR_VERSION.$LIBVIR_MICRO_VERSION$LIBVIR_MICRO_VERSION_SUFFIX LIBVIRT_VERSION=$LIBVIRT_MAJOR_VERSION.$LIBVIRT_MINOR_VERSION.$LIBVIRT_MICRO_VERSION$LIBVIRT_MICRO_VERSION_SUFFIX
LIBVIR_VERSION_INFO=`expr $LIBVIR_MAJOR_VERSION + $LIBVIR_MINOR_VERSION`:$LIBVIR_MICRO_VERSION:$LIBVIR_MINOR_VERSION LIBVIRT_VERSION_INFO=`expr $LIBVIRT_MAJOR_VERSION + $LIBVIRT_MINOR_VERSION`:$LIBVIRT_MICRO_VERSION:$LIBVIRT_MINOR_VERSION
LIBVIR_VERSION_NUMBER=`expr $LIBVIR_MAJOR_VERSION \* 1000000 + $LIBVIR_MINOR_VERSION \* 1000 + $LIBVIR_MICRO_VERSION` LIBVIRT_VERSION_NUMBER=`expr $LIBVIRT_MAJOR_VERSION \* 1000000 + $LIBVIRT_MINOR_VERSION \* 1000 + $LIBVIRT_MICRO_VERSION`
if test -f CVS/Entries; then if test -f CVS/Entries; then
extra=`grep ChangeLog CVS/Entries | grep -v LIBVIR | sed -e s\%/ChangeLog/1\.%% -e s\%/.*$%%` extra=`grep ChangeLog CVS/Entries | grep -v LIBVIR | sed -e s\%/ChangeLog/1\.%% -e s\%/.*$%%`
echo extra=$extra echo extra=$extra
if test "$extra" != "" if test "$extra" != ""
then then
LIBVIR_VERSION_EXTRA="-CVS$extra" LIBVIRT_VERSION_EXTRA="-CVS$extra"
fi fi
fi fi
AC_SUBST(LIBVIR_MAJOR_VERSION) AC_SUBST(LIBVIRT_MAJOR_VERSION)
AC_SUBST(LIBVIR_MINOR_VERSION) AC_SUBST(LIBVIRT_MINOR_VERSION)
AC_SUBST(LIBVIR_MICRO_VERSION) AC_SUBST(LIBVIRT_MICRO_VERSION)
AC_SUBST(LIBVIR_VERSION) AC_SUBST(LIBVIRT_VERSION)
AC_SUBST(LIBVIR_VERSION_INFO) AC_SUBST(LIBVIRT_VERSION_INFO)
AC_SUBST(LIBVIR_VERSION_NUMBER) AC_SUBST(LIBVIRT_VERSION_NUMBER)
AC_SUBST(LIBVIR_VERSION_EXTRA) AC_SUBST(LIBVIRT_VERSION_EXTRA)
VERSION=${LIBVIR_VERSION} VERSION=${LIBVIRT_VERSION}
AM_INIT_AUTOMAKE(libvirt, $VERSION) AM_INIT_AUTOMAKE(libvirt, $VERSION)

2
include/libvirt.h.in
View File

@@ -167,7 +167,7 @@ typedef enum {
* version * 1,000,000 + minor * 1000 + micro * version * 1,000,000 + minor * 1000 + micro
*/ */
#define LIBVIR_VERSION_NUMBER @LIBVIR_VERSION_NUMBER@ #define LIBVIR_VERSION_NUMBER @LIBVIRT_VERSION_NUMBER@
int virGetVersion (unsigned long *libVer, int virGetVersion (unsigned long *libVer,
const char *type, const char *type,

2
include/libvirt/libvirt.h.in
View File

@@ -167,7 +167,7 @@ typedef enum {
* version * 1,000,000 + minor * 1000 + micro * version * 1,000,000 + minor * 1000 + micro
*/ */
#define LIBVIR_VERSION_NUMBER @LIBVIR_VERSION_NUMBER@ #define LIBVIR_VERSION_NUMBER @LIBVIRT_VERSION_NUMBER@
int virGetVersion (unsigned long *libVer, int virGetVersion (unsigned long *libVer,
const char *type, const char *type,

1
libvirt.spec.in
View File

@@ -86,6 +86,7 @@ rm -fr %{buildroot}
%doc AUTHORS NEWS README COPYING.LIB %doc AUTHORS NEWS README COPYING.LIB
%{_libdir}/python*/site-packages/libvirt.py* %{_libdir}/python*/site-packages/libvirt.py*
%{_libdir}/python*/site-packages/libvirtmod* %{_libdir}/python*/site-packages/libvirtmod*
%doc python/tests/*.py
%doc python/TODO %doc python/TODO
%doc python/libvirtclass.txt %doc python/libvirtclass.txt

4
python/Makefile.am
View File

@@ -1,6 +1,6 @@
# Makefile for libvirt python library # Makefile for libvirt python library
SUBRIRS= . tests SUBDIRS= . tests
INCLUDES = \ INCLUDES = \
-I$(PYTHON_INCLUDES) \ -I$(PYTHON_INCLUDES) \
@@ -8,7 +8,7 @@ INCLUDES = \
-I$(top_builddir)/include \ -I$(top_builddir)/include \
-I$(top_builddir)/$(subdir) -I$(top_builddir)/$(subdir)
DOCS_DIR = $(datadir)/doc/libvirt-python-$(LIBVIR_VERSION) DOCS_DIR = $(datadir)/doc/libvirt-python-$(LIBVIRT_VERSION)
DOCS = ${srcdir}/TODO DOCS = ${srcdir}/TODO

2
src/Makefile.am
View File

@@ -10,7 +10,7 @@ EXTRA_DIST = libvirt_sym.version
lib_LTLIBRARIES = libvirt.la lib_LTLIBRARIES = libvirt.la
libvirt_la_LIBADD = libvirt_la_LIBADD =
libvirt_la_LDFLAGS = -Wl,--version-script=$(srcdir)/libvirt_sym.version \ libvirt_la_LDFLAGS = -Wl,--version-script=$(srcdir)/libvirt_sym.version \
-version-info @LIBVIR_VERSION_INFO@ -version-info @LIBVIRT_VERSION_INFO@
libvirt_la_SOURCES = \ libvirt_la_SOURCES = \
libvirt.c internal.h \ libvirt.c internal.h \
hash.c hash.h \ hash.c hash.h \