]>
Commit | Line | Data |
---|---|---|
08915e57 JB |
1 | --- OpenIPMI-2.0.7/swig/python/openipmigui/Makefile.am.orig 2006-06-08 05:10:43.000000000 +0200 |
2 | +++ OpenIPMI-2.0.7/swig/python/openipmigui/Makefile.am 2006-08-22 12:20:57.085971000 +0200 | |
3 | @@ -26,7 +26,7 @@ | |
7ef7a05e JB |
4 | $(INSTALL) -d $(DESTDIR)$(PYTHON_INSTALL_DIR)/openipmigui |
5 | $(INSTALL_PROGRAM) $^ $(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) | |
08915e57 | 9 | PYLDPATH=$(top_builddir)/lib/.libs:$(top_builddir)/utils/.libs:$(top_builddir)/glib/.libs:$(top_builddir)/unix/.libs:$(top_builddir)/cmdlang/.libs:$(top_builddir)/tcl/.libs |
7ef7a05e JB |
10 | |
11 | .py.pyc: | |
08915e57 JB |
12 | --- OpenIPMI-2.0.7/swig/python/Makefile.am.orig 2006-04-06 16:13:47.000000000 +0200 |
13 | +++ OpenIPMI-2.0.7/swig/python/Makefile.am 2006-08-22 12:20:35.075971000 +0200 | |
7ef7a05e JB |
14 | @@ -5,20 +5,15 @@ |
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 | +pythonlibdir=$(PYTHON_INSTALL_DIR) | |
26 | +pythonlib_LTLIBRARIES = _OpenIPMI.la | |
27 | +_OpenIPMI_la_SOURCES = OpenIPMI_wrap.c | |
28 | +_OpenIPMI_la_LDFLAGS = -module -avoid-version | |
29 | ||
30 | -COMPILE = $(CC) $(DEFS) $(AM_CFLAGS) $(CFLAGS) | |
31 | - | |
32 | -all-local: _OpenIPMI.so | |
33 | - | |
34 | -OpenIPMI_SRC = OpenIPMI_wrap.c | |
35 | -OpenIPMI_OBJ = OpenIPMI_wrap.o | |
36 | - | |
37 | -OpenIPMI_LIB = @PYTHON_POSIX_LIB@ \ | |
38 | +_OpenIPMI_la_LIBADD = @PYTHON_POSIX_LIB@ \ | |
39 | $(top_builddir)/lib/libOpenIPMI.la \ | |
40 | $(top_builddir)/utils/libOpenIPMIutils.la \ | |
41 | $(top_builddir)/cmdlang/libOpenIPMIcmdlang.la \ | |
42 | @@ -26,31 +21,20 @@ | |
43 | ||
44 | EXTRA_DIST = OpenIPMI_lang.i OpenIPMI.h openipmigui.py | |
45 | ||
46 | -_OpenIPMI.so: $(OpenIPMI_OBJ) | |
47 | - $(LIBTOOL) --mode=link $(CC) -shared -o $@ $^ $(OpenIPMI_LIB) \ | |
48 | - -R/$(libdir) | |
49 | - rm _OpenIPMI.so | |
50 | - mv .libs/_OpenIPMI.so . | |
51 | - rm -rf .libs | |
52 | - | |
53 | -OpenIPMI_wrap.o OpenIPMI.py: OpenIPMI_wrap.c OpenIPMI.h | |
54 | - $(COMPILE) -c $< | |
55 | - | |
56 | -OpenIPMI.pyc: OpenIPMI.py _OpenIPMI.so | |
57 | +OpenIPMI.pyc: OpenIPMI.py _OpenIPMI.la | |
58 | -$(pythonprog) -c 'import OpenIPMI.py' | |
59 | ||
60 | -OpenIPMI.pyo: OpenIPMI.py _OpenIPMI.so | |
61 | +OpenIPMI.pyo: OpenIPMI.py _OpenIPMI.la | |
62 | -$(pythonprog) -O -c 'import OpenIPMI.py' | |
63 | ||
64 | OpenIPMI_wrap.c: $(top_srcdir)/swig/OpenIPMI.i OpenIPMI_lang.i | |
65 | $(SWIG) $(DEFS) -python -o $@ -I$(top_srcdir)/swig/python $< | |
66 | ||
67 | -CLEANFILES = $(OpenIPMI_OBJ) _OpenIPMI.so OpenIPMI_wrap.c \ | |
68 | +CLEANFILES = OpenIPMI.lo _OpenIPMI.la OpenIPMI_wrap.c \ | |
69 | OpenIPMI.py OpenIPMI.pyo OpenIPMI.pyc | |
70 | ||
71 | -install-exec-local: _OpenIPMI.so OpenIPMI.py OpenIPMI.pyc OpenIPMI.pyo | |
72 | +install-exec-local: _OpenIPMI.la OpenIPMI.py OpenIPMI.pyc OpenIPMI.pyo | |
73 | $(INSTALL) -d $(DESTDIR)$(PYTHON_INSTALL_DIR) | |
74 | - $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) _OpenIPMI.so $(DESTDIR)$(PYTHON_INSTALL_DIR) | |
75 | $(INSTALL_PROGRAM) OpenIPMI.py $(DESTDIR)$(PYTHON_INSTALL_DIR) | |
76 | $(INSTALL_PROGRAM) OpenIPMI.pyc $(DESTDIR)$(PYTHON_INSTALL_DIR) | |
77 | $(INSTALL_PROGRAM) OpenIPMI.pyo $(DESTDIR)$(PYTHON_INSTALL_DIR) | |
78 | @@ -59,7 +43,7 @@ | |
79 | $(INSTALL_PROGRAM) openipmigui.py $(DESTDIR)$(bindir)/openipmigui;\ | |
80 | fi | |
81 | ||
82 | -PYPATH=$(top_builddir)/swig/python | |
83 | +PYPATH=$(top_builddir)/swig/python:$(top_builddir)/swig/python/.libs | |
08915e57 | 84 | PYLDPATH=$(top_builddir)/lib/.libs:$(top_builddir)/utils/.libs:$(top_builddir)/glib/.libs:$(top_builddir)/unix/.libs:$(top_builddir)/cmdlang/.libs:$(top_builddir)/tcl/.libs |
7ef7a05e JB |
85 | |
86 | rungui: |