blob: b21995e3cbb8058ed55f8d70fc679c91f1cafe11 (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
|
Index: mjpegtools-1.8.0/mpeg2enc/Makefile.am
===================================================================
--- mjpegtools-1.8.0.orig/mpeg2enc/Makefile.am
+++ mjpegtools-1.8.0/mpeg2enc/Makefile.am
@@ -110,7 +110,7 @@ libmpeg2encpp_la_LIBADD = $(LIBMJPEGUTIL
mpeg2enc_DEPENDENCIES = \
$(LIBMJPEGUTILS) \
- $(top_builddir)/mpeg2enc/libmpeg2encpp.la
+ libmpeg2encpp.la
mpeg2enc_LDADD = \
$(top_builddir)/mpeg2enc/libmpeg2encpp.la \
Index: mjpegtools-1.8.0/mpeg2enc/Makefile.in
===================================================================
--- mjpegtools-1.8.0.orig/mpeg2enc/Makefile.in
+++ mjpegtools-1.8.0/mpeg2enc/Makefile.in
@@ -374,7 +374,7 @@ libmpeg2encpp_la_DEPENDENCIES = $(LIBMJP
libmpeg2encpp_la_LIBADD = $(LIBMJPEGUTILS)
mpeg2enc_DEPENDENCIES = \
$(LIBMJPEGUTILS) \
- $(top_builddir)/mpeg2enc/libmpeg2encpp.la
+ libmpeg2encpp.la
mpeg2enc_LDADD = \
$(top_builddir)/mpeg2enc/libmpeg2encpp.la \
Index: mjpegtools-1.8.0/mplex/Makefile.am
===================================================================
--- mjpegtools-1.8.0.orig/mplex/Makefile.am
+++ mjpegtools-1.8.0/mplex/Makefile.am
@@ -79,5 +79,5 @@ libmplex2_la_CXXFLAGS = $(ZALPHA_FLAGS)
mplex_SOURCES = main.cpp
mplex_LDADD = \
- $(top_builddir)/mplex/libmplex2.la \
+ libmplex2.la \
@LIBGETOPT_LIB@ $(LIBM_LIBS)
Index: mjpegtools-1.8.0/mplex/Makefile.in
===================================================================
--- mjpegtools-1.8.0.orig/mplex/Makefile.in
+++ mjpegtools-1.8.0/mplex/Makefile.in
@@ -95,8 +95,7 @@ PROGRAMS = $(bin_PROGRAMS)
am_mplex_OBJECTS = main.$(OBJEXT)
mplex_OBJECTS = $(am_mplex_OBJECTS)
am__DEPENDENCIES_2 =
-mplex_DEPENDENCIES = $(top_builddir)/mplex/libmplex2.la \
- $(am__DEPENDENCIES_2)
+mplex_DEPENDENCIES = libmplex2.la $(am__DEPENDENCIES_2)
DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
depcomp = $(SHELL) $(top_srcdir)/depcomp
am__depfiles_maybe = depfiles
@@ -340,7 +339,7 @@ libmplex2_la_LIBADD = $(top_builddir)/ut
libmplex2_la_CXXFLAGS = $(ZALPHA_FLAGS)
mplex_SOURCES = main.cpp
mplex_LDADD = \
- $(top_builddir)/mplex/libmplex2.la \
+ libmplex2.la \
@LIBGETOPT_LIB@ $(LIBM_LIBS)
all: all-am
|
GitWeb
