Fixup fromcvs/togit conversion
[minix-pkgsrc.git] / audio / arts / patches / patch-ad
blob49cb8ed01a79c64de87cb91fe2d5614f56f2d120
1 $NetBSD$
3 --- soundserver/Makefile.in.orig        Wed Aug 20 17:07:21 2008
4 +++ soundserver/Makefile.in     Tue Jan 20 13:11:08 2009
5 @@ -529,7 +529,7 @@
6         libartsgslplayobject.la libartswavplayobject.la libkmedia2.la
7  
8  AM_LDFLAGS = $(LDFLAGS_AS_NEEDED)
9 -libsoundserver_idl_la_LIBADD = libkmedia2_idl.la \
10 +libsoundserver_idl_la_LIBADD = libkmedia2_idl.la $(top_builddir)/mcop/libmcop.la \
11                            $(top_builddir)/flow/libartsflow_idl.la
13  libsoundserver_idl_la_LDFLAGS = -no-undefined -version-info 1:0 $(all_libraries)
14 @@ -537,21 +537,27 @@
15  libsoundserver_idl_la_COMPILE_FIRST = soundserver.h
16  libkmedia2_idl_la_SOURCES = kmedia2.cc
17  libkmedia2_idl_la_COMPILE_FIRST = kmedia2.h
18 -libkmedia2_idl_la_LIBADD = $(top_builddir)/flow/libartsflow.la
19 +libkmedia2_idl_la_LIBADD = $(top_builddir)/flow/libartsflow.la \
20 +    $(top_builddir)/mcop/libmcop.la $(top_builddir)/flow/libartsflow_idl.la
21  libkmedia2_idl_la_LDFLAGS = -no-undefined -version-info 1:0 $(all_libraries)
22  libkmedia2_la_SOURCES = fileinputstream_impl.cc stdoutwriter_impl.cc
23 -libkmedia2_la_LIBADD = libkmedia2_idl.la $(FLOWLIBS)
24 +libkmedia2_la_LIBADD = libkmedia2_idl.la $(FLOWLIBS) \
25 +    $(top_builddir)/mcop/libmcop.la $(top_builddir)/flow/libartsflow_idl.la
26  libkmedia2_la_LDFLAGS = -no-undefined -version-info 1:0 $(all_libraries)
27  libkmedia2_la_COMPILE_FIRST = kmedia2.h ../flow/artsflow.h
28  libartswavplayobject_la_SOURCES = wavplayobject_impl.cc
29  libartswavplayobject_la_LIBADD = $(top_builddir)/mcop/libmcop.la \
30 -                                  libsoundserver_idl.la $(FLOWLIBS)
31 +                                  libsoundserver_idl.la $(FLOWLIBS) \
32 +                                 $(top_builddir)/soundserver/libkmedia2_idl.la \
33 +                                 $(top_builddir)/flow/libartsflow_idl.la -lm
35  libartswavplayobject_la_LDFLAGS = -no-undefined -module $(all_libraries)
36  libartswavplayobject_la_COMPILE_FIRST = soundserver.h ../flow/artsflow.h
37  libartsgslplayobject_la_SOURCES = gslplayobject_impl.cc
38  libartsgslplayobject_la_LIBADD = $(top_builddir)/mcop/libmcop.la \
39 -                                  libsoundserver_idl.la $(FLOWLIBS)
40 +                                  libsoundserver_idl.la $(FLOWLIBS) \
41 +                                 $(top_builddir)/soundserver/libkmedia2_idl.la \
42 +                                 $(top_builddir)/flow/libartsflow_idl.la -lm
44  libartsgslplayobject_la_LDFLAGS = -no-undefined -module $(all_libraries)
45  libartsgslplayobject_la_COMPILE_FIRST = soundserver.h ../flow/artsflow.h