Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 297326 | Differences between
and this patch

Collapse All | Expand All

(-)iulib-0.4.orig/genAM.py (-8 / +9 lines)
Lines 30-36 AM_CPPFLAGS = -I$(srcdir)/colib -I$(srcd Link Here
30
includedir = ${prefix}/include/iulib
30
includedir = ${prefix}/include/iulib
31
colibdir = ${prefix}/include/colib
31
colibdir = ${prefix}/include/colib
32
32
33
lib_LIBRARIES = libiulib.a
33
AM_LDFLAGS = -shared
34
lib_LTLIBRARIES = libiulib.la
34
"""
35
"""
35
36
36
dirs = """
37
dirs = """
Lines 39-45 dirs = """ Link Here
39
    imgbits
40
    imgbits
40
""".split()
41
""".split()
41
42
42
print "libiulib_a_SOURCES = ",
43
print "libiulib_la_SOURCES = ",
43
for d in dirs:
44
for d in dirs:
44
    print '\\'
45
    print '\\'
45
    for cc in glob.glob(d + "/*.cc"):
46
    for cc in glob.glob(d + "/*.cc"):
Lines 73-79 print "check_PROGRAMS = " + s.join(" " + Link Here
73
for t in tests:
74
for t in tests:
74
    tName = os.path.basename(t)[:-3].replace('-','_')
75
    tName = os.path.basename(t)[:-3].replace('-','_')
75
    print tName + "_SOURCES = $(srcdir)/" + t
76
    print tName + "_SOURCES = $(srcdir)/" + t
76
    print tName + "_LDADD = libiulib.a"
77
    print tName + "_LDADD = -liulib"
77
    print tName + "_CPPFLAGS = -I$(srcdir)/colib -I$(srcdir)/imgio -I$(srcdir)/imglib"
78
    print tName + "_CPPFLAGS = -I$(srcdir)/colib -I$(srcdir)/imgio -I$(srcdir)/imglib"
78
79
79
80
Lines 82-103 for t in tests: Link Here
82
print """
83
print """
83
# conditionals
84
# conditionals
84
if have_sdl
85
if have_sdl
85
    libiulib_a_SOURCES += $(srcdir)/utils/dgraphics.cc
86
    libiulib_la_SOURCES += $(srcdir)/utils/dgraphics.cc
86
    libiulib_a_SOURCES += $(srcdir)/utils/SDL_lines.cc
87
    libiulib_la_SOURCES += $(srcdir)/utils/SDL_lines.cc
87
    include_HEADERS += $(srcdir)/utils/SDL_lines.h
88
    include_HEADERS += $(srcdir)/utils/SDL_lines.h
88
else
89
else
89
    libiulib_a_SOURCES += $(srcdir)/utils/dgraphics_nosdl.cc
90
    libiulib_la_SOURCES += $(srcdir)/utils/dgraphics_nosdl.cc
90
endif
91
endif
91
92
92
if have_vidio
93
if have_vidio
93
    libiulib_a_SOURCES += $(srcdir)/vidio/vidio.cc
94
    libiulib_la_SOURCES += $(srcdir)/vidio/vidio.cc
94
endif
95
endif
95
96
96
# We install it always because iulib.h always includes it.
97
# We install it always because iulib.h always includes it.
97
include_HEADERS += $(srcdir)/vidio/vidio.h
98
include_HEADERS += $(srcdir)/vidio/vidio.h
98
99
99
if have_v4l2
100
if have_v4l2
100
    libiulib_a_SOURCES += $(srcdir)/vidio/v4l2cap.cc
101
    libiulib_la_SOURCES += $(srcdir)/vidio/v4l2cap.cc
101
endif
102
endif
102
103
103
# make installation of colib a separate target
104
# make installation of colib a separate target
(-)iulib-0.4.orig/configure.ac (-1 / +1 lines)
Lines 10-16 AC_CONFIG_SRCDIR([colib/colib.h]) Link Here
10
10
11
AC_PROG_CXX
11
AC_PROG_CXX
12
AC_PROG_CC
12
AC_PROG_CC
13
AC_PROG_RANLIB
13
AC_PROG_LIBTOOL
14
14
15
AC_HEADER_STDC
15
AC_HEADER_STDC
16
AC_HEADER_SYS_WAIT
16
AC_HEADER_SYS_WAIT

Return to bug 297326