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
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
|
$NetBSD: patch-bb,v 1.6 2003/05/22 03:05:41 markd Exp $
--- noatun/library/Makefile.in.orig Thu May 8 00:05:29 2003
+++ noatun/library/Makefile.in
@@ -387,9 +387,9 @@ INCLUDES = -I$(top_srcdir)/noatun/librar
SUBDIRS = noatunarts noatun . noatuntags
-lib_LTLIBRARIES = libnoatun.la libnoatuncontrols.la
+lib_LTLIBRARIES = libnoatun_core.la libnoatuncontrols.la
-libnoatun_la_SOURCES = pluginmodule.cpp cmodule.cpp downloader.cpp engine.cpp \
+libnoatun_core_la_SOURCES = pluginmodule.cpp cmodule.cpp downloader.cpp engine.cpp \
playlist.cpp pref.cpp \
player.cpp playlistsaver.cpp app.cpp \
pluginloader.cpp plugin.cpp \
@@ -402,15 +402,15 @@ libnoatun_la_SOURCES = pluginmodule.cpp
include_HEADERS = cmodule.h plugin_deps.h equalizerview.h effectview.h mimetypetree.h ksaver.h
-libnoatun_la_LDFLAGS = -L$(top_builddir)/noatun/library/noatunarts \
+libnoatun_core_la_LDFLAGS = -L$(top_builddir)/noatun/library/noatunarts \
$(KDE_RPATH) $(all_libraries) -L$(top_builddir)/arts/gui/common \
-L$(top_builddir)/arts/gui/kde
-libnoatun_la_LIBADD = $(top_builddir)/arts/gui/common/libartsgui.la \
+libnoatun_core_la_LIBADD = $(top_builddir)/arts/gui/common/libartsgui.la \
$(top_builddir)/arts/gui/kde/libartsgui_kde.la \
$(top_builddir)/arts/modules/libartsmodules.la \
- -lkio -lqtmcop -lkmedia2_idl -lnoatunarts \
+ -lkio -lqtmcop -lkmedia2_idl $(top_builddir)/noatun/library/noatunarts/libnoatunarts.la \
-lartsflow -lsoundserver_idl -lartskde $(LIBDL) $(LIBPNG)
@@ -432,27 +432,28 @@ CONFIG_HEADER = $(top_builddir)/config.h
CONFIG_CLEAN_FILES =
LTLIBRARIES = $(lib_LTLIBRARIES)
-libnoatun_la_DEPENDENCIES = \
+libnoatun_core_la_DEPENDENCIES = \
$(top_builddir)/arts/gui/common/libartsgui.la \
$(top_builddir)/arts/gui/kde/libartsgui_kde.la \
- $(top_builddir)/arts/modules/libartsmodules.la
-am_libnoatun_la_OBJECTS = pluginmodule.lo cmodule.lo downloader.lo \
+ $(top_builddir)/arts/modules/libartsmodules.la \
+ $(top_builddir)/noatun/library/noatunarts/libnoatunarts.la
+am_libnoatun_core_la_OBJECTS = pluginmodule.lo cmodule.lo downloader.lo \
engine.lo playlist.lo pref.lo player.lo playlistsaver.lo app.lo \
pluginloader.lo plugin.lo noatunstdaction.lo conversion.lo \
noatunui.lo effectview.lo equalizerview.lo equalizer.lo \
effects.lo mimetypetree.lo stereobuttonaction.lo ksaver.lo \
video.lo
-#>- libnoatun_la_OBJECTS = $(am_libnoatun_la_OBJECTS)
+#>- libnoatun_core_la_OBJECTS = $(am_libnoatun_core_la_OBJECTS)
#>+ 9
-libnoatun_la_final_OBJECTS = libnoatun_la.all_cpp.lo
-libnoatun_la_nofinal_OBJECTS = pluginmodule.lo cmodule.lo downloader.lo \
+libnoatun_core_la_final_OBJECTS = libnoatun_core_la.all_cpp.lo
+libnoatun_core_la_nofinal_OBJECTS = pluginmodule.lo cmodule.lo downloader.lo \
engine.lo playlist.lo pref.lo player.lo playlistsaver.lo app.lo \
pluginloader.lo plugin.lo noatunstdaction.lo conversion.lo \
noatunui.lo effectview.lo equalizerview.lo equalizer.lo \
effects.lo mimetypetree.lo stereobuttonaction.lo ksaver.lo \
video.lo
-@KDE_USE_FINAL_FALSE@libnoatun_la_OBJECTS = $(libnoatun_la_nofinal_OBJECTS)
-@KDE_USE_FINAL_TRUE@libnoatun_la_OBJECTS = $(libnoatun_la_final_OBJECTS)
+@KDE_USE_FINAL_FALSE@libnoatun_core_la_OBJECTS = $(libnoatun_core_la_nofinal_OBJECTS)
+@KDE_USE_FINAL_TRUE@libnoatun_core_la_OBJECTS = $(libnoatun_core_la_final_OBJECTS)
libnoatuncontrols_la_DEPENDENCIES =
am_libnoatuncontrols_la_OBJECTS = controls.lo scrollinglabel.lo
#>- libnoatuncontrols_la_OBJECTS = $(am_libnoatuncontrols_la_OBJECTS)
@@ -492,7 +493,7 @@ am__depfiles_maybe = depfiles
#>- @AMDEP_TRUE@ ./$(DEPDIR)/stereobuttonaction.Plo \
#>- @AMDEP_TRUE@ ./$(DEPDIR)/video.Plo
#>+ 35
-@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@DEP_FILES = $(DEPDIR)/libnoatun_la.all_cpp.P $(DEPDIR)/libnoatuncontrols_la.all_cpp.P ./$(DEPDIR)/app.Plo ./$(DEPDIR)/cmodule.Plo \
+@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@DEP_FILES = $(DEPDIR)/libnoatun_core_la.all_cpp.P $(DEPDIR)/libnoatuncontrols_la.all_cpp.P ./$(DEPDIR)/app.Plo ./$(DEPDIR)/cmodule.Plo \
@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/controls.Plo ./$(DEPDIR)/conversion.Plo \
@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/downloader.Plo ./$(DEPDIR)/effects.Plo \
@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/effectview.Plo ./$(DEPDIR)/engine.Plo \
@@ -545,8 +546,8 @@ CXXLD = $(CXX)
#>+ 2
CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \
$(AM_LDFLAGS) $(LDFLAGS) -o $@
-DIST_SOURCES = $(libnoatun_la_SOURCES) $(libnoatuncontrols_la_SOURCES) \
- $(gentable_SOURCES)
+DIST_SOURCES = $(libnoatun_core_la_SOURCES) \
+ $(libnoatuncontrols_la_SOURCES) $(gentable_SOURCES)
DATA = $(magictable_DATA)
HEADERS = $(include_HEADERS)
@@ -559,7 +560,7 @@ RECURSIVE_TARGETS = info-recursive dvi-r
check-recursive installcheck-recursive
DIST_COMMON = $(include_HEADERS) Makefile.am Makefile.in
DIST_SUBDIRS = $(SUBDIRS)
-SOURCES = $(libnoatun_la_SOURCES) $(libnoatuncontrols_la_SOURCES) $(gentable_SOURCES)
+SOURCES = $(libnoatun_core_la_SOURCES) $(libnoatuncontrols_la_SOURCES) $(gentable_SOURCES)
#>- all: all-recursive
#>+ 1
@@ -604,8 +605,8 @@ clean-libLTLIBRARIES:
echo "rm -f \"$${dir}/so_locations\""; \
rm -f "$${dir}/so_locations"; \
done
-libnoatun.la: $(libnoatun_la_OBJECTS) $(libnoatun_la_DEPENDENCIES)
- $(CXXLINK) -rpath $(libdir) $(libnoatun_la_LDFLAGS) $(libnoatun_la_OBJECTS) $(libnoatun_la_LIBADD) $(LIBS)
+libnoatun_core.la: $(libnoatun_core_la_OBJECTS) $(libnoatun_core_la_DEPENDENCIES)
+ $(CXXLINK) -rpath $(libdir) $(libnoatun_core_la_LDFLAGS) $(libnoatun_core_la_OBJECTS) $(libnoatun_core_la_LIBADD) $(LIBS)
libnoatuncontrols.la: $(libnoatuncontrols_la_OBJECTS) $(libnoatuncontrols_la_DEPENDENCIES)
$(CXXLINK) -rpath $(libdir) $(libnoatuncontrols_la_LDFLAGS) $(libnoatuncontrols_la_OBJECTS) $(libnoatuncontrols_la_LIBADD) $(LIBS)
@@ -852,7 +853,7 @@ distclean-tags:
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
#>+ 4
-KDE_DIST=fft.c globalvideo.h pluginmodule.h noatunlistview.h fft.h
+KDE_DIST=fft.h noatunlistview.h pluginmodule.h globalvideo.h fft.c
DISTFILES= $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
@@ -1015,28 +1016,28 @@ magictable: gentable
.NOEXPORT:
#>+ 3
-plugin_deps.moc: $(srcdir)/plugin_deps.h
- $(MOC) $(srcdir)/plugin_deps.h -o plugin_deps.moc
+equalizerview.moc: $(srcdir)/equalizerview.h
+ $(MOC) $(srcdir)/equalizerview.h -o equalizerview.moc
#>+ 3
-mimetypetree.moc: $(srcdir)/mimetypetree.h
- $(MOC) $(srcdir)/mimetypetree.h -o mimetypetree.moc
+plugin_deps.moc: $(srcdir)/plugin_deps.h
+ $(MOC) $(srcdir)/plugin_deps.h -o plugin_deps.moc
#>+ 3
-effectview.moc: $(srcdir)/effectview.h
- $(MOC) $(srcdir)/effectview.h -o effectview.moc
+cmodule.moc: $(srcdir)/cmodule.h
+ $(MOC) $(srcdir)/cmodule.h -o cmodule.moc
#>+ 3
-equalizerview.moc: $(srcdir)/equalizerview.h
- $(MOC) $(srcdir)/equalizerview.h -o equalizerview.moc
+mimetypetree.moc: $(srcdir)/mimetypetree.h
+ $(MOC) $(srcdir)/mimetypetree.h -o mimetypetree.moc
#>+ 3
pluginmodule.moc: $(srcdir)/pluginmodule.h
$(MOC) $(srcdir)/pluginmodule.h -o pluginmodule.moc
#>+ 3
-cmodule.moc: $(srcdir)/cmodule.h
- $(MOC) $(srcdir)/cmodule.h -o cmodule.moc
+effectview.moc: $(srcdir)/effectview.h
+ $(MOC) $(srcdir)/effectview.h -o effectview.moc
#>+ 3
globalvideo.moc: $(srcdir)/globalvideo.h
@@ -1044,7 +1045,7 @@ globalvideo.moc: $(srcdir)/globalvideo.h
#>+ 3
clean-metasources:
- -rm -f plugin_deps.moc mimetypetree.moc effectview.moc equalizerview.moc pluginmodule.moc cmodule.moc globalvideo.moc
+ -rm -f equalizerview.moc plugin_deps.moc cmodule.moc mimetypetree.moc pluginmodule.moc effectview.moc globalvideo.moc
#>+ 2
docs-am:
@@ -1057,16 +1058,16 @@ force-reedit:
#>+ 11
-libnoatun_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/pluginmodule.cpp $(srcdir)/cmodule.cpp $(srcdir)/downloader.cpp $(srcdir)/engine.cpp $(srcdir)/playlist.cpp $(srcdir)/pref.cpp $(srcdir)/player.cpp $(srcdir)/playlistsaver.cpp $(srcdir)/app.cpp $(srcdir)/pluginloader.cpp $(srcdir)/plugin.cpp $(srcdir)/noatunstdaction.cpp $(srcdir)/conversion.cpp $(srcdir)/noatunui.cpp $(srcdir)/effectview.cpp $(srcdir)/equalizerview.cpp $(srcdir)/equalizer.cpp $(srcdir)/effects.cpp $(srcdir)/mimetypetree.cpp $(srcdir)/stereobuttonaction.cpp $(srcdir)/ksaver.cpp $(srcdir)/video.cpp plugin_deps.moc mimetypetree.moc effectview.moc cmodule.moc pluginmodule.moc equalizerview.moc globalvideo.moc
- @echo 'creating libnoatun_la.all_cpp.cpp ...'; \
- rm -f libnoatun_la.all_cpp.files libnoatun_la.all_cpp.final; \
- echo "#define KDE_USE_FINAL 1" >> libnoatun_la.all_cpp.final; \
+libnoatun_core_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/pluginmodule.cpp $(srcdir)/cmodule.cpp $(srcdir)/downloader.cpp $(srcdir)/engine.cpp $(srcdir)/playlist.cpp $(srcdir)/pref.cpp $(srcdir)/player.cpp $(srcdir)/playlistsaver.cpp $(srcdir)/app.cpp $(srcdir)/pluginloader.cpp $(srcdir)/plugin.cpp $(srcdir)/noatunstdaction.cpp $(srcdir)/conversion.cpp $(srcdir)/noatunui.cpp $(srcdir)/effectview.cpp $(srcdir)/equalizerview.cpp $(srcdir)/equalizer.cpp $(srcdir)/effects.cpp $(srcdir)/mimetypetree.cpp $(srcdir)/stereobuttonaction.cpp $(srcdir)/ksaver.cpp $(srcdir)/video.cpp equalizerview.moc cmodule.moc plugin_deps.moc mimetypetree.moc pluginmodule.moc globalvideo.moc effectview.moc
+ @echo 'creating libnoatun_core_la.all_cpp.cpp ...'; \
+ rm -f libnoatun_core_la.all_cpp.files libnoatun_core_la.all_cpp.final; \
+ echo "#define KDE_USE_FINAL 1" >> libnoatun_core_la.all_cpp.final; \
for file in pluginmodule.cpp cmodule.cpp downloader.cpp engine.cpp playlist.cpp pref.cpp player.cpp playlistsaver.cpp app.cpp pluginloader.cpp plugin.cpp noatunstdaction.cpp conversion.cpp noatunui.cpp effectview.cpp equalizerview.cpp equalizer.cpp effects.cpp mimetypetree.cpp stereobuttonaction.cpp ksaver.cpp video.cpp ; do \
- echo "#include \"$$file\"" >> libnoatun_la.all_cpp.files; \
- test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> libnoatun_la.all_cpp.final; \
+ echo "#include \"$$file\"" >> libnoatun_core_la.all_cpp.files; \
+ test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> libnoatun_core_la.all_cpp.final; \
done; \
- cat libnoatun_la.all_cpp.final libnoatun_la.all_cpp.files > libnoatun_la.all_cpp.cpp; \
- rm -f libnoatun_la.all_cpp.final libnoatun_la.all_cpp.files
+ cat libnoatun_core_la.all_cpp.final libnoatun_core_la.all_cpp.files > libnoatun_core_la.all_cpp.cpp; \
+ rm -f libnoatun_core_la.all_cpp.final libnoatun_core_la.all_cpp.files
#>+ 11
libnoatuncontrols_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/controls.cpp $(srcdir)/scrollinglabel.cpp
@@ -1082,20 +1083,20 @@ libnoatuncontrols_la.all_cpp.cpp: $(srcd
#>+ 3
clean-final:
- -rm -f libnoatun_la.all_cpp.cpp libnoatuncontrols_la.all_cpp.cpp
+ -rm -f libnoatun_core_la.all_cpp.cpp libnoatuncontrols_la.all_cpp.cpp
#>+ 2
final:
- $(MAKE) libnoatun_la_OBJECTS="$(libnoatun_la_final_OBJECTS)" libnoatuncontrols_la_OBJECTS="$(libnoatuncontrols_la_final_OBJECTS)" all-am
+ $(MAKE) libnoatun_core_la_OBJECTS="$(libnoatun_core_la_final_OBJECTS)" libnoatuncontrols_la_OBJECTS="$(libnoatuncontrols_la_final_OBJECTS)" all-am
#>+ 2
final-install:
- $(MAKE) libnoatun_la_OBJECTS="$(libnoatun_la_final_OBJECTS)" libnoatuncontrols_la_OBJECTS="$(libnoatuncontrols_la_final_OBJECTS)" install-am
+ $(MAKE) libnoatun_core_la_OBJECTS="$(libnoatun_core_la_final_OBJECTS)" libnoatuncontrols_la_OBJECTS="$(libnoatuncontrols_la_final_OBJECTS)" install-am
#>+ 2
no-final:
- $(MAKE) libnoatun_la_OBJECTS="$(libnoatun_la_nofinal_OBJECTS)" libnoatuncontrols_la_OBJECTS="$(libnoatuncontrols_la_nofinal_OBJECTS)" all-am
+ $(MAKE) libnoatun_core_la_OBJECTS="$(libnoatun_core_la_nofinal_OBJECTS)" libnoatuncontrols_la_OBJECTS="$(libnoatuncontrols_la_nofinal_OBJECTS)" all-am
#>+ 2
no-final-install:
- $(MAKE) libnoatun_la_OBJECTS="$(libnoatun_la_nofinal_OBJECTS)" libnoatuncontrols_la_OBJECTS="$(libnoatuncontrols_la_nofinal_OBJECTS)" install-am
+ $(MAKE) libnoatun_core_la_OBJECTS="$(libnoatun_core_la_nofinal_OBJECTS)" libnoatuncontrols_la_OBJECTS="$(libnoatuncontrols_la_nofinal_OBJECTS)" install-am
#>+ 3
cvs-clean:
$(MAKE) admindir=$(top_srcdir)/admin -f $(top_srcdir)/admin/Makefile.common cvs-clean
@@ -1105,17 +1106,17 @@ kde-rpo-clean:
-rm -f *.rpo
#>+ 15
-mimetypetree.o: mimetypetree.moc
-effectview.lo: effectview.moc
-equalizerview.o: equalizerview.moc
-effectview.o: effectview.moc
-video.lo: globalvideo.moc
+equalizerview.lo: equalizerview.moc
pluginmodule.lo: pluginmodule.moc
video.o: globalvideo.moc
-plugin.lo: plugin_deps.moc
-cmodule.o: cmodule.moc
-equalizerview.lo: equalizerview.moc
-plugin.o: plugin_deps.moc
-mimetypetree.lo: mimetypetree.moc
cmodule.lo: cmodule.moc
+video.lo: globalvideo.moc
+effectview.o: effectview.moc
pluginmodule.o: pluginmodule.moc
+plugin.o: plugin_deps.moc
+equalizerview.o: equalizerview.moc
+cmodule.o: cmodule.moc
+mimetypetree.o: mimetypetree.moc
+effectview.lo: effectview.moc
+mimetypetree.lo: mimetypetree.moc
+plugin.lo: plugin_deps.moc
|
