]> git.pld-linux.org Git - packages/rpm.git/blob - rpm-python-fix.patch
- rpmpopt patch updates: merged drop-legacy-CLI patch, added pl.po update,
[packages/rpm.git] / rpm-python-fix.patch
1 --- rpm-4.3/python/Makefile.am.wiget    2003-05-06 17:44:12.000000000 +0200
2 +++ rpm-4.3/python/Makefile.am  2003-06-10 13:22:13.859888700 +0200
3 @@ -29,45 +29,35 @@
4         rpmfi-py.h rpmmi-py.h rpmrc-py.h rpmte-py.h rpmts-py.h
5  
6  mylibs= \
7 -       $(top_builddir)/lib/.libs/librpm.so \
8 -       $(top_builddir)/rpmdb/.libs/librpmdb.so \
9 -       $(top_builddir)/rpmio/.libs/librpmio.so \
10 -       $(top_builddir)/popt/.libs/libpopt.so \
11 +       $(top_builddir)/lib/librpm.la \
12 +       $(top_builddir)/rpmdb/librpmdb.la \
13 +       $(top_builddir)/rpmio/librpmio.la \
14 +       -lbeecrypt \
15 +       -lpopt \
16         @WITH_LIBELF_LIB@
17  
18  LDADD =
19  
20  pythondir = $(pylibdir)/site-packages
21 -python_PROGRAMS = rpmmodule.so
22 +python_LTLIBRARIES = rpmmodule.la poptmodule.la
23  
24  rpmdbdir = $(pylibdir)/site-packages/rpmdb
25 -rpmdb_PROGRAMS = _rpmdb.so
26 +rpmdb_LTLIBRARIES = _rpmdb.la
27  
28 -noinst_PROGRAMS = poptmodule.so
29 +_rpmdb_la_SOURCES = _rpmdb.c
30 +_rpmdb_la_LIBADD = $(mylibs) $(LIBS)
31 +_rpmdb_la_LDFLAGS = -module -avoid-version
32  
33 -rpmmodule_so_SOURCES =
34 -rpmmodule_so_LDFLAGS = $(mylibs) $(LIBS) -shared -Wl,-soname,rpmmodule.so
35 +poptmodule_la_SOURCES = poptmodule.c
36 +poptmodule_la_LIBADD = $(mylibs) $(LIBS)
37 +poptmodule_la_LDFLAGS = -module -avoid-version
38  
39 -_rpmdb_so_SOURCES = _rpmdb.c
40 -_rpmdb_so_LDFLAGS = $(mylibs) $(LIBS) -shared -Wl,-soname,_rpmdb.so
41 -
42 -poptmodule_so_SOURCES = poptmodule.c
43 -poptmodule_so_LDFLAGS = $(mylibs) $(LIBS) -shared -Wl,-soname,poptmodule.so
44 -
45 -noinst_LTLIBRARIES = librpmmodule.la
46 -librpmmodule_la_SOURCES = rpmmodule.c header-py.c \
47 +rpmmodule_la_SOURCES = rpmmodule.c header-py.c \
48         rpmbc-py.c rpmmpw-py.c rpmrng-py.c \
49         rpmal-py.c rpmds-py.c rpmdb-py.c rpmfd-py.c rpmfts-py.c \
50         rpmfi-py.c rpmmi-py.c rpmrc-py.c rpmte-py.c rpmts-py.c
51 -
52 -rpmmodule.so$(EXEEXT): $(librpmmodule_la_OBJECTS)
53 -       $(CC) -o $@ $(librpmmodule_la_OBJECTS) $(rpmmodule_so_LDFLAGS)
54 -
55 -_rpmdb.so$(EXEEXT): _rpmdb.lo
56 -       $(CC) -o $@ _rpmdb.lo $(_rpmdb_so_LDFLAGS)
57 -
58 -poptmodule.so$(EXEEXT): poptmodule.lo
59 -       $(CC) -o $@ poptmodule.lo $(poptmodule_so_LDFLAGS)
60 +rpmmodule_la_LIBADD = $(mylibs) $(LIBS)
61 +rpmmodule_la_LDFLAGS = -module -avoid-version 
62  
63  # rpmmodule.c header-py.c \
64  #      rpmal-py.c rpmds-py.c rpmdb-py.c rpmfd-py.c rpmfi-py.c rpmmi-py.c \
This page took 0.035778 seconds and 4 git commands to generate.