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

Return to bug 297326