OpenIPMI-python.patch

   1 --- OpenIPMI-2.0.13/swig/python/openipmigui/Makefile.am.orig    2007-11-03 20:00:30.925230000 +0100
   2 +++ OpenIPMI-2.0.13/swig/python/openipmigui/Makefile.am 2007-11-03 20:17:14.238405581 +0100
   3 @@ -35,12 +35,12 @@
   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 +       LD_PRELOAD=$(OPENIPMI_SWIG_SO):$(top_builddir)/swig/python/.libs/_OpenIPMI.so PYTHONPATH=$(PYPATH) $(pythonprog) -c 'import $*'
  13
  14  .py.pyo:
  15 -       LD_PRELOAD=$(OPENIPMI_SWIG_SO):$(top_builddir)/swig/python/_OpenIPMI.so PYTHONPATH=$(PYPATH) $(pythonprog) -O -c 'import $*'
  16 +       LD_PRELOAD=$(OPENIPMI_SWIG_SO):$(top_builddir)/swig/python/.libs/_OpenIPMI.so PYTHONPATH=$(PYPATH) $(pythonprog) -O -c 'import $*'
  17
  18  CLEANFILES = $(PYC_FILES) $(PYO_FILES)
  19 --- OpenIPMI-2.0.13/swig/python/Makefile.am.orig        2007-10-16 18:10:53.000000000 +0200
  20 +++ OpenIPMI-2.0.13/swig/python/Makefile.am     2007-11-03 20:15:34.520722993 +0100
  21 @@ -5,46 +5,33 @@ AM_CFLAGS = $(PYTHON_CFLAGS) \
  22             -I $(top_builddir) \
  23             -I $(top_builddir)/include \
  24             -I $(top_srcdir)/include \
  25 -           -I $(top_srcdir)/swig/python
  26 +           -I $(top_srcdir)/swig/python \
  27 +           -Wall -DPYTHON_HAS_POSIX_THREADS=@PYTHON_HAS_POSIX_THREADS@
  28
  29 -CC = @CC@ -Wall
  30 -CFLAGS = @CFLAGS@ -fPIC -DPYTHON_HAS_POSIX_THREADS=@PYTHON_HAS_POSIX_THREADS@
  31 -DEFS = @DEFS@
  32 +pythonlibdir=$(PYTHON_INSTALL_LIB_DIR)
  33 +PYPATH=$(top_builddir)/swig/python:$(top_builddir)/swig/python/.libs:$(srcdir)/openipmigui
  34
  35 -COMPILE = $(CC) $(DEFS) $(AM_CFLAGS) $(CFLAGS)
  36 +pythonlib_LTLIBRARIES = _OpenIPMI.la
  37
  38 -all-local: _OpenIPMI.so
  39 -
  40 -OpenIPMI_SRC = OpenIPMI_wrap.c
  41 -OpenIPMI_OBJ = OpenIPMI_wrap.o
  42 +_OpenIPMI_la_SOURCES = OpenIPMI_wrap.c
  43 +_OpenIPMI_la_LDFLAGS = -module -avoid-version
  44 +_OpenIPMI_la_LIBADD = $(OPENIPMI_SWIG_LIBS)
  45
  46  EXTRA_DIST = OpenIPMI_lang.i OpenIPMI.h openipmigui.py
  47
  48 -_OpenIPMI.so: $(OpenIPMI_OBJ)
  49 -       $(LIBTOOL) --mode=link $(CC) -shared -o $@ $^ $(OPENIPMI_SWIG_LIBS)
  50 -       rm _OpenIPMI.so
  51 -       mv .libs/_OpenIPMI.so .
  52 -       rm -rf .libs
  53 -
  54 -OpenIPMI_wrap.o OpenIPMI.py: OpenIPMI_wrap.c OpenIPMI.h
  55 -       $(COMPILE) -c $<
  56 -
  57 -OpenIPMI.pyc: OpenIPMI.py _OpenIPMI.so
  58 -       -$(pythonprog) -c 'import OpenIPMI.py'
  59 +OpenIPMI.pyc: OpenIPMI.py _OpenIPMI.la
  60 +       -PYTHONPATH=$(PYPATH) $(pythonprog) -c 'import OpenIPMI.py'
  61
  62 -OpenIPMI.pyo: OpenIPMI.py _OpenIPMI.so
  63 -       -$(pythonprog) -O -c 'import OpenIPMI.py'
  64 +OpenIPMI.pyo: OpenIPMI.py _OpenIPMI.la
  65 +       -PYTHONPATH=$(PYPATH) $(pythonprog) -O -c 'import OpenIPMI.py'
  66
  67 -OpenIPMI_wrap.c: $(top_srcdir)/swig/OpenIPMI.i OpenIPMI_lang.i
  68 +OpenIPMI_wrap.c OpenIPMI.py: $(top_srcdir)/swig/OpenIPMI.i OpenIPMI_lang.i
  69         $(SWIG) $(DEFS) -python -o $@ -I$(top_srcdir)/swig/python $<
  70
  71 -CLEANFILES = $(OpenIPMI_OBJ) _OpenIPMI.so OpenIPMI_wrap.c \
  72 -       OpenIPMI.py OpenIPMI.pyo OpenIPMI.pyc
  73 +CLEANFILES = OpenIPMI_wrap.c OpenIPMI.py OpenIPMI.pyo OpenIPMI.pyc
  74
  75 -install-exec-local: _OpenIPMI.so OpenIPMI.py OpenIPMI.pyc OpenIPMI.pyo
  76 +install-exec-local: _OpenIPMI.la OpenIPMI.py OpenIPMI.pyc OpenIPMI.pyo
  77         $(INSTALL) -d $(DESTDIR)$(PYTHON_INSTALL_DIR)
  78 -       $(INSTALL) -d $(DESTDIR)$(PYTHON_INSTALL_LIB_DIR)
  79 -       $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) _OpenIPMI.so "$(DESTDIR)$(PYTHON_INSTALL_LIB_DIR)/"
  80         $(INSTALL_DATA) OpenIPMI.py "$(DESTDIR)$(PYTHON_INSTALL_DIR)"
  81         $(INSTALL_DATA) OpenIPMI.pyc "$(DESTDIR)$(PYTHON_INSTALL_DIR)"
  82         $(INSTALL_DATA) OpenIPMI.pyo "$(DESTDIR)$(PYTHON_INSTALL_DIR)"
  83 @@ -60,7 +47,5 @@ uninstall-local:
  84         rm -f "$(DESTDIR)$(PYTHON_INSTALL_DIR)/OpenIPMI.pyo"
  85         rm -f "$(DESTDIR)$(bindir)/openipmigui"
  86
  87 -PYPATH=$(top_builddir)/swig/python:$(srcdir)/openipmigui
  88 -
  89  rungui:
  90         LD_LIBRARY_PATH=$(top_builddir)/glib/.libs LD_PRELOAD=$(OPENIPMI_SWIG_SO) PYTHONPATH=$(PYPATH) $(pythonprog) $(top_srcdir)/swig/python/openipmigui.py