Annotation of /trunk/mjpegtools/patches/mjpegtools-1.8.0-parallelmake.patch
Parent Directory | Revision Log
Revision 224 -
(hide annotations)
(download)
Sat Jun 23 13:53:28 2007 UTC (17 years, 3 months ago) by niro
File size: 2163 byte(s)
Sat Jun 23 13:53:28 2007 UTC (17 years, 3 months ago) by niro
File size: 2163 byte(s)
-new fixes
1 | niro | 224 | Index: mjpegtools-1.8.0/mpeg2enc/Makefile.am |
2 | =================================================================== | ||
3 | --- mjpegtools-1.8.0.orig/mpeg2enc/Makefile.am | ||
4 | +++ mjpegtools-1.8.0/mpeg2enc/Makefile.am | ||
5 | @@ -110,7 +110,7 @@ libmpeg2encpp_la_LIBADD = $(LIBMJPEGUTIL | ||
6 | |||
7 | mpeg2enc_DEPENDENCIES = \ | ||
8 | $(LIBMJPEGUTILS) \ | ||
9 | - $(top_builddir)/mpeg2enc/libmpeg2encpp.la | ||
10 | + libmpeg2encpp.la | ||
11 | |||
12 | mpeg2enc_LDADD = \ | ||
13 | $(top_builddir)/mpeg2enc/libmpeg2encpp.la \ | ||
14 | Index: mjpegtools-1.8.0/mpeg2enc/Makefile.in | ||
15 | =================================================================== | ||
16 | --- mjpegtools-1.8.0.orig/mpeg2enc/Makefile.in | ||
17 | +++ mjpegtools-1.8.0/mpeg2enc/Makefile.in | ||
18 | @@ -374,7 +374,7 @@ libmpeg2encpp_la_DEPENDENCIES = $(LIBMJP | ||
19 | libmpeg2encpp_la_LIBADD = $(LIBMJPEGUTILS) | ||
20 | mpeg2enc_DEPENDENCIES = \ | ||
21 | $(LIBMJPEGUTILS) \ | ||
22 | - $(top_builddir)/mpeg2enc/libmpeg2encpp.la | ||
23 | + libmpeg2encpp.la | ||
24 | |||
25 | mpeg2enc_LDADD = \ | ||
26 | $(top_builddir)/mpeg2enc/libmpeg2encpp.la \ | ||
27 | Index: mjpegtools-1.8.0/mplex/Makefile.am | ||
28 | =================================================================== | ||
29 | --- mjpegtools-1.8.0.orig/mplex/Makefile.am | ||
30 | +++ mjpegtools-1.8.0/mplex/Makefile.am | ||
31 | @@ -79,5 +79,5 @@ libmplex2_la_CXXFLAGS = $(ZALPHA_FLAGS) | ||
32 | mplex_SOURCES = main.cpp | ||
33 | |||
34 | mplex_LDADD = \ | ||
35 | - $(top_builddir)/mplex/libmplex2.la \ | ||
36 | + libmplex2.la \ | ||
37 | @LIBGETOPT_LIB@ $(LIBM_LIBS) | ||
38 | Index: mjpegtools-1.8.0/mplex/Makefile.in | ||
39 | =================================================================== | ||
40 | --- mjpegtools-1.8.0.orig/mplex/Makefile.in | ||
41 | +++ mjpegtools-1.8.0/mplex/Makefile.in | ||
42 | @@ -95,8 +95,7 @@ PROGRAMS = $(bin_PROGRAMS) | ||
43 | am_mplex_OBJECTS = main.$(OBJEXT) | ||
44 | mplex_OBJECTS = $(am_mplex_OBJECTS) | ||
45 | am__DEPENDENCIES_2 = | ||
46 | -mplex_DEPENDENCIES = $(top_builddir)/mplex/libmplex2.la \ | ||
47 | - $(am__DEPENDENCIES_2) | ||
48 | +mplex_DEPENDENCIES = libmplex2.la $(am__DEPENDENCIES_2) | ||
49 | DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) | ||
50 | depcomp = $(SHELL) $(top_srcdir)/depcomp | ||
51 | am__depfiles_maybe = depfiles | ||
52 | @@ -340,7 +339,7 @@ libmplex2_la_LIBADD = $(top_builddir)/ut | ||
53 | libmplex2_la_CXXFLAGS = $(ZALPHA_FLAGS) | ||
54 | mplex_SOURCES = main.cpp | ||
55 | mplex_LDADD = \ | ||
56 | - $(top_builddir)/mplex/libmplex2.la \ | ||
57 | + libmplex2.la \ | ||
58 | @LIBGETOPT_LIB@ $(LIBM_LIBS) | ||
59 | |||
60 | all: all-am |