OpenIPMI-python.patch

   1 --- OpenIPMI-2.0.10/swig/python/openipmigui/Makefile.am.orig    2006-11-08 18:09:10.000000000 +0100
   2 +++ OpenIPMI-2.0.10/swig/python/openipmigui/Makefile.am 2006-12-03 21:45:47.330986735 +0100
   3 @@ -35,7 +35,7 @@
   4         done)
   5         -rmdir "$(DESTDIR)$(PYTHON_INSTALL_DIR)/openipmigui"
   6
   7 -PYPATH=$(top_builddir)/swig/python:$(srcdir)
   8 +PYPATH=$(top_builddir)/swig/python:$(top_builddir)/swig/python/.libs:$(srcdir)
   9
  10  .py.pyc:
  11         LD_PRELOAD=$(OPENIPMI_SWIG_SO):$(top_builddir)/swig/python/_OpenIPMI.so PYTHONPATH=$(PYPATH) $(pythonprog) -c 'import $*'
  12 --- OpenIPMI-2.0.10/swig/python/Makefile.am.orig        2006-11-14 17:22:41.000000000 +0100
  13 +++ OpenIPMI-2.0.10/swig/python/Makefile.am     2006-12-03 21:51:35.774843419 +0100
  14 @@ -5,46 +5,32 @@
  15             -I $(top_builddir) \
  16             -I $(top_builddir)/include \
  17             -I $(top_srcdir)/include \
  18 -           -I $(top_srcdir)/swig/python
  19 +           -I $(top_srcdir)/swig/python \
  20 +           -Wall -DPYTHON_HAS_POSIX_THREADS=@PYTHON_HAS_POSIX_THREADS@ @DEFS@
  21
  22 -CC = @CC@ -Wall
  23 -CFLAGS = @CFLAGS@ -fPIC -DPYTHON_HAS_POSIX_THREADS=@PYTHON_HAS_POSIX_THREADS@
  24 -DEFS = @DEFS@
  25 -
  26 -COMPILE = $(CC) $(DEFS) $(AM_CFLAGS) $(CFLAGS)
  27 -
  28 -all-local: _OpenIPMI.so
  29 -
  30 -OpenIPMI_SRC = OpenIPMI_wrap.c
  31 -OpenIPMI_OBJ = OpenIPMI_wrap.o
  32 +pythonlibdir=$(PYTHON_INSTALL_DIR)
  33 +pythonlib_LTLIBRARIES = _OpenIPMI.la
  34 +_OpenIPMI_la_SOURCES = OpenIPMI_wrap.c
  35 +_OpenIPMI_la_LDFLAGS = -module -avoid-version
  36 +
  37 +_OpenIPMI_la_LIBADD = $(OPENIPMI_SWIG_LIBS)
  38
  39  EXTRA_DIST = OpenIPMI_lang.i OpenIPMI.h openipmigui.py
  40
  41 -_OpenIPMI.so: $(OpenIPMI_OBJ)
  42 -       $(LIBTOOL) --mode=link $(CC) -shared -o $@ $^ $(OPENIPMI_SWIG_LIBS) \
  43 -               -R/$(libdir)
  44 -       rm _OpenIPMI.so
  45 -       mv .libs/_OpenIPMI.so .
  46 -       rm -rf .libs
  47 -
  48 -OpenIPMI_wrap.o OpenIPMI.py: OpenIPMI_wrap.c OpenIPMI.h
  49 -       $(COMPILE) -c $<
  50 -
  51 -OpenIPMI.pyc: OpenIPMI.py _OpenIPMI.so
  52 +OpenIPMI.pyc: OpenIPMI.py _OpenIPMI.la
  53         -$(pythonprog) -c 'import OpenIPMI.py'
  54
  55 -OpenIPMI.pyo: OpenIPMI.py _OpenIPMI.so
  56 +OpenIPMI.pyo: OpenIPMI.py _OpenIPMI.la
  57         -$(pythonprog) -O -c 'import OpenIPMI.py'
  58
  59  OpenIPMI_wrap.c: $(top_srcdir)/swig/OpenIPMI.i OpenIPMI_lang.i
  60         $(SWIG) $(DEFS) -python -o $@ -I$(top_srcdir)/swig/python $<
  61
  62 -CLEANFILES = $(OpenIPMI_OBJ) _OpenIPMI.so OpenIPMI_wrap.c \
  63 +CLEANFILES = $(OpenIPMI_OBJ) _OpenIPMI.la OpenIPMI_wrap.c \
  64         OpenIPMI.py OpenIPMI.pyo OpenIPMI.pyc
  65
  66 -install-exec-local: _OpenIPMI.so OpenIPMI.py OpenIPMI.pyc OpenIPMI.pyo
  67 +install-exec-local: _OpenIPMI.la OpenIPMI.py OpenIPMI.pyc OpenIPMI.pyo
  68         $(INSTALL) -d $(DESTDIR)$(PYTHON_INSTALL_DIR)
  69 -       $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) _OpenIPMI.so "$(DESTDIR)$(PYTHON_INSTALL_DIR)"
  70         $(INSTALL_PROGRAM) OpenIPMI.py "$(DESTDIR)$(PYTHON_INSTALL_DIR)"
  71         $(INSTALL_PROGRAM) OpenIPMI.pyc "$(DESTDIR)$(PYTHON_INSTALL_DIR)"
  72         $(INSTALL_PROGRAM) OpenIPMI.pyo "$(DESTDIR)$(PYTHON_INSTALL_DIR)"
  73 @@ -60,7 +46,7 @@
  74         rm -f "$(DESTDIR)$(PYTHON_INSTALL_DIR)/OpenIPMI.pyo"
  75         rm -f "$(DESTDIR)$(bindir)/openipmigui"
  76
  77 -PYPATH=$(top_builddir)/swig/python:$(srcdir)/openipmigui
  78 +PYPATH=$(top_builddir)/swig/python:$(top_builddir)/swig/python/.libs:$(srcdir)/openipmigui
  79
  80  rungui:
  81         LD_LIBRARY_PATH=$(top_builddir)/glib/.libs LD_PRELOAD=$(OPENIPMI_SWIG_SO):$(top_builddir)/swig/python/_OpenIPMI.so PYTHONPATH=$(PYPATH) $(pythonprog) $(top_srcdir)/swig/python/openipmigui.py