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
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
|
--- soundserver/Makefile.in.orig Wed Apr 7 09:12:08 2004
+++ soundserver/Makefile.in Wed Apr 7 09:14:08 2004
@@ -20,7 +20,7 @@
-SOURCES = $(libartsgslplayobject_la_SOURCES) $(libartswavplayobject_la_SOURCES) $(libkmedia2_la_SOURCES) $(libkmedia2_idl_la_SOURCES) $(libsoundserver_idl_la_SOURCES) $(artscat_SOURCES) $(artsd_SOURCES) $(artsplay_SOURCES) $(artsrec_SOURCES) $(artsshell_SOURCES) $(artswrapper_SOURCES)
+SOURCES = $(libartsgslplayobject_la_SOURCES) $(libartswavplayobject_la_SOURCES) $(libkmedia2_la_SOURCES) $(libkmedia2_idl_la_SOURCES) $(libsoundserver_idl_la_SOURCES) $(artscat_SOURCES) $(artsd_SOURCES) $(artsplay_SOURCES) $(artsrec_SOURCES) $(artsshell_SOURCES)
srcdir = @srcdir@
top_srcdir = @top_srcdir@
@@ -46,7 +46,7 @@
host_triplet = @host@
target_triplet = @target@
bin_PROGRAMS = artsd$(EXEEXT) artsplay$(EXEEXT) artscat$(EXEEXT) \
- artswrapper$(EXEEXT) artsshell$(EXEEXT) artsrec$(EXEEXT)
+ artsshell$(EXEEXT) artsrec$(EXEEXT)
subdir = soundserver
DIST_COMMON = $(artsinclude_HEADERS) $(srcdir)/Makefile.am \
$(srcdir)/Makefile.in $(srcdir)/artsversion-new.h.in
@@ -234,12 +234,12 @@
$(libartswavplayobject_la_SOURCES) $(libkmedia2_la_SOURCES) \
$(libkmedia2_idl_la_SOURCES) $(libsoundserver_idl_la_SOURCES) \
$(artscat_SOURCES) $(artsd_SOURCES) $(artsplay_SOURCES) \
- $(artsrec_SOURCES) $(artsshell_SOURCES) $(artswrapper_SOURCES)
+ $(artsrec_SOURCES) $(artsshell_SOURCES)
DIST_SOURCES = $(libartsgslplayobject_la_SOURCES) \
$(libartswavplayobject_la_SOURCES) $(libkmedia2_la_SOURCES) \
$(libkmedia2_idl_la_SOURCES) $(libsoundserver_idl_la_SOURCES) \
$(artscat_SOURCES) $(artsd_SOURCES) $(artsplay_SOURCES) \
- $(artsrec_SOURCES) $(artsshell_SOURCES) $(artswrapper_SOURCES)
+ $(artsrec_SOURCES) $(artsshell_SOURCES)
mcopclassDATA_INSTALL = $(INSTALL_DATA)
mcoptypeDATA_INSTALL = $(INSTALL_DATA)
DATA = $(mcopclass_DATA) $(mcoptype_DATA)
@@ -558,9 +558,6 @@
artsplay_LDADD = libsoundserver_idl.la $(USE_THREADS)
artsplay_SOURCES = artsplay.cc
artsplay_COMPILE_FIRST = soundserver.h artsversion.h
-artswrapper_SOURCES = artswrapper.c
-artswrapper_INCLUDES = -I$(top_builddir) -DEXECUTE=\"$(artsdpath)\"
-artswrapper_LDADD = $(LIBPOSIX4)
artsshell_LDADD = libsoundserver_idl.la $(USE_THREADS)
artsshell_SOURCES = artsshell.cc tradercheck.cc
artsshell_COMPILE_FIRST = soundserver.h artsversion.h
@@ -571,10 +568,6 @@
mcopclassdir = $(libdir)/mcop/Arts
mcopclass_DATA = FileInputStream.mcopclass $(WAV_MCOPCLASS) GSLPlayObject.mcopclass
-#install-exec-hook:
-# @(chown root $(DESTDIR)$(bindir)/artswrapper && chmod 4755 $(DESTDIR)$(bindir)/artswrapper) \
-# || echo "please make $(DESTDIR)$(bindir)/artswrapper suid root"
-
######## install idl typeinfo files
mcoptypedir = $(libdir)/mcop
mcoptype_DATA = soundserver.mcoptype soundserver.mcopclass \
@@ -725,9 +718,6 @@
artsshell$(EXEEXT): $(artsshell_OBJECTS) $(artsshell_DEPENDENCIES)
@rm -f artsshell$(EXEEXT)
$(CXXLINK) $(artsshell_LDFLAGS) $(artsshell_OBJECTS) $(artsshell_LDADD) $(LIBS)
-artswrapper$(EXEEXT): $(artswrapper_OBJECTS) $(artswrapper_DEPENDENCIES)
- @rm -f artswrapper$(EXEEXT)
- $(LINK) $(artswrapper_LDFLAGS) $(artswrapper_OBJECTS) $(artswrapper_LDADD) $(LIBS)
mostlyclean-compile:
-rm -f *.$(OBJEXT)
--- soundserver/Makefile.in.orig Tue Jun 1 16:36:34 2004
+++ soundserver/Makefile.in Tue Jun 1 16:45:08 2004
@@ -545,20 +545,20 @@
libartsgslplayobject_la_LDFLAGS = -no-undefined $(KDE_NO_UNDEFINED) -module $(all_libraries)
libartsgslplayobject_la_COMPILE_FIRST = soundserver.h ../flow/artsflow.h
artsd_LDADD = libsoundserver_idl.la $(FLOWLIBS) \
- $(top_builddir)/mcop_mt/libmcop_mt.la $(USE_THREADS)
+ $(top_builddir)/mcop_mt/libmcop_mt.la $(USE_THREADS) $(LIBPTHREAD)
artsd_SOURCES = soundserverv2_impl.cc soundserver_impl.cc simplesoundserver_impl.cc artsd.cc cpuusage.cc samplestorage_impl.cc crashhandler.cc soundserverstartup_impl.cc
artsd_COMPILE_FIRST = soundserver.h artsversion.h
-artscat_LDADD = libsoundserver_idl.la $(FLOWLIBS) $(USE_THREADS)
+artscat_LDADD = libsoundserver_idl.la $(FLOWLIBS) $(USE_THREADS) $(LIBPTHREAD)
artscat_SOURCES = artscat.cc
artscat_COMPILE_FIRST = soundserver.h artsversion.h
-artsrec_LDADD = libsoundserver_idl.la $(FLOWLIBS) $(USE_THREADS)
+artsrec_LDADD = libsoundserver_idl.la $(FLOWLIBS) $(USE_THREADS) $(LIBPTHREAD)
artsrec_SOURCES = artsrec.cc
artsrec_COMPILE_FIRST = soundserver.h artsversion.h
-artsplay_LDADD = libsoundserver_idl.la $(USE_THREADS)
+artsplay_LDADD = libsoundserver_idl.la $(USE_THREADS) $(LIBPTHREAD)
artsplay_SOURCES = artsplay.cc
artsplay_COMPILE_FIRST = soundserver.h artsversion.h
-artsshell_LDADD = libsoundserver_idl.la $(USE_THREADS)
+artsshell_LDADD = libsoundserver_idl.la $(USE_THREADS) $(LIBPTHREAD)
artsshell_SOURCES = artsshell.cc tradercheck.cc
artsshell_COMPILE_FIRST = soundserver.h artsversion.h
DISTCLEANFILES = soundserver.cc soundserver.h soundserver.mcopclass \
|
