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
|
$NetBSD: patch-br,v 1.1.1.1 2004/01/26 15:42:37 jmmv Exp $
--- noatun/modules/kjofol-skin/Makefile.in.orig 2003-12-29 11:29:39.000000000 +1300
+++ noatun/modules/kjofol-skin/Makefile.in
@@ -401,7 +401,7 @@ noatun_kjofol_la_SOURCES=kjloader.cpp kj
noatun_kjofol_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined
-noatun_kjofol_la_LIBADD = $(LIB_KFILE) $(top_builddir)/noatun/library/libnoatun.la \
+noatun_kjofol_la_LIBADD = $(LIB_KFILE) $(top_builddir)/noatun/library/libnoatun_core.la \
$(LIB_KIO) -lm \
$(top_builddir)/arts/modules/libartsmodules.la
@@ -423,7 +423,7 @@ CONFIG_CLEAN_FILES =
LTLIBRARIES = $(kde_module_LTLIBRARIES)
noatun_kjofol_la_DEPENDENCIES = \
- $(top_builddir)/noatun/library/libnoatun.la \
+ $(top_builddir)/noatun/library/libnoatun_core.la \
$(top_builddir)/arts/modules/libartsmodules.la
am_noatun_kjofol_la_OBJECTS = kjloader.lo kjwidget.lo kjbutton.lo \
kjseeker.lo kjsliders.lo kjfont.lo kjtextdisplay.lo kjvis.lo \
@@ -757,7 +757,7 @@ distclean-tags:
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
#>+ 4
-KDE_DIST=kjofolui.plugin kjskinselectorwidget.ui helpers.cpp kjguisettingswidget.ui
+KDE_DIST=kjskinselectorwidget.ui kjofolui.plugin Makefile.in.rej helpers.cpp kjguisettingswidget.ui
DISTFILES= $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
@@ -957,32 +957,32 @@ kjguisettingswidget.moc: kjguisettingswi
$(MOC) kjguisettingswidget.h -o kjguisettingswidget.moc
#>+ 3
-kjequalizer.moc: $(srcdir)/kjequalizer.h
- $(MOC) $(srcdir)/kjequalizer.h -o kjequalizer.moc
-
-#>+ 1
-mocs: kjequalizer.moc
-#>+ 3
-kjloader.moc: $(srcdir)/kjloader.h
- $(MOC) $(srcdir)/kjloader.h -o kjloader.moc
-
-#>+ 1
-mocs: kjloader.moc
-#>+ 3
kjtextdisplay.moc: $(srcdir)/kjtextdisplay.h
$(MOC) $(srcdir)/kjtextdisplay.h -o kjtextdisplay.moc
#>+ 1
mocs: kjtextdisplay.moc
#>+ 3
+kjequalizer.moc: $(srcdir)/kjequalizer.h
+ $(MOC) $(srcdir)/kjequalizer.h -o kjequalizer.moc
+
+#>+ 1
+mocs: kjequalizer.moc
+#>+ 3
kjprefs.moc: $(srcdir)/kjprefs.h
$(MOC) $(srcdir)/kjprefs.h -o kjprefs.moc
#>+ 1
mocs: kjprefs.moc
#>+ 3
+kjloader.moc: $(srcdir)/kjloader.h
+ $(MOC) $(srcdir)/kjloader.h -o kjloader.moc
+
+#>+ 1
+mocs: kjloader.moc
+#>+ 3
clean-metasources:
- -rm -f kjequalizer.moc kjloader.moc kjtextdisplay.moc kjprefs.moc
+ -rm -f kjtextdisplay.moc kjequalizer.moc kjprefs.moc kjloader.moc
#>+ 5
clean-ui:
@@ -1005,7 +1005,7 @@ force-reedit:
#>+ 11
-noatun_kjofol_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kjloader.cpp $(srcdir)/kjwidget.cpp $(srcdir)/kjbutton.cpp $(srcdir)/kjseeker.cpp $(srcdir)/kjsliders.cpp $(srcdir)/kjfont.cpp $(srcdir)/kjtextdisplay.cpp $(srcdir)/kjvis.cpp $(srcdir)/kjequalizer.cpp $(srcdir)/kjbackground.cpp $(srcdir)/noatunui.cpp $(srcdir)/parser.cpp $(srcdir)/kjprefs.cpp kjskinselectorwidget.cpp kjguisettingswidget.cpp kjskinselectorwidget.moc kjequalizer.moc kjguisettingswidget.moc kjloader.moc kjtextdisplay.moc kjprefs.moc
+noatun_kjofol_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kjloader.cpp $(srcdir)/kjwidget.cpp $(srcdir)/kjbutton.cpp $(srcdir)/kjseeker.cpp $(srcdir)/kjsliders.cpp $(srcdir)/kjfont.cpp $(srcdir)/kjtextdisplay.cpp $(srcdir)/kjvis.cpp $(srcdir)/kjequalizer.cpp $(srcdir)/kjbackground.cpp $(srcdir)/noatunui.cpp $(srcdir)/parser.cpp $(srcdir)/kjprefs.cpp kjskinselectorwidget.cpp kjguisettingswidget.cpp kjtextdisplay.moc kjguisettingswidget.moc kjequalizer.moc kjskinselectorwidget.moc kjprefs.moc kjloader.moc
@echo 'creating noatun_kjofol_la.all_cpp.cpp ...'; \
rm -f noatun_kjofol_la.all_cpp.files noatun_kjofol_la.all_cpp.final; \
echo "#define KDE_USE_FINAL 1" >> noatun_kjofol_la.all_cpp.final; \
@@ -1041,24 +1041,24 @@ kde-rpo-clean:
-rm -f *.rpo
#>+ 22
-$(srcdir)/kjbackground.cpp: kjskinselectorwidget.h kjguisettingswidget.h
-$(srcdir)/noatunui.cpp: kjskinselectorwidget.h kjguisettingswidget.h
-$(srcdir)/kjtextdisplay.cpp: kjskinselectorwidget.h kjguisettingswidget.h
kjprefs.o: kjprefs.moc
-$(srcdir)/kjprefs.cpp: kjskinselectorwidget.h kjguisettingswidget.h
-kjtextdisplay.o: kjtextdisplay.moc
+$(srcdir)/kjtextdisplay.cpp: kjskinselectorwidget.h kjguisettingswidget.h
$(srcdir)/kjseeker.cpp: kjskinselectorwidget.h kjguisettingswidget.h
$(srcdir)/kjloader.cpp: kjskinselectorwidget.h kjguisettingswidget.h
kjequalizer.lo: kjequalizer.moc
+$(srcdir)/kjbutton.cpp: kjskinselectorwidget.h kjguisettingswidget.h
+$(srcdir)/kjprefs.cpp: kjskinselectorwidget.h kjguisettingswidget.h
kjtextdisplay.lo: kjtextdisplay.moc
-kjprefs.lo: kjprefs.moc
+$(srcdir)/kjvis.cpp: kjskinselectorwidget.h kjguisettingswidget.h
+kjloader.lo: kjloader.moc
+$(srcdir)/parser.cpp: kjskinselectorwidget.h kjguisettingswidget.h
+$(srcdir)/kjwidget.cpp: kjskinselectorwidget.h kjguisettingswidget.h
+$(srcdir)/kjequalizer.cpp: kjskinselectorwidget.h kjguisettingswidget.h
+kjequalizer.o: kjequalizer.moc
$(srcdir)/kjfont.cpp: kjskinselectorwidget.h kjguisettingswidget.h
+kjtextdisplay.o: kjtextdisplay.moc
$(srcdir)/kjsliders.cpp: kjskinselectorwidget.h kjguisettingswidget.h
+$(srcdir)/kjbackground.cpp: kjskinselectorwidget.h kjguisettingswidget.h
+$(srcdir)/noatunui.cpp: kjskinselectorwidget.h kjguisettingswidget.h
+kjprefs.lo: kjprefs.moc
kjloader.o: kjloader.moc
-kjequalizer.o: kjequalizer.moc
-$(srcdir)/kjbutton.cpp: kjskinselectorwidget.h kjguisettingswidget.h
-$(srcdir)/kjequalizer.cpp: kjskinselectorwidget.h kjguisettingswidget.h
-$(srcdir)/kjwidget.cpp: kjskinselectorwidget.h kjguisettingswidget.h
-kjloader.lo: kjloader.moc
-$(srcdir)/kjvis.cpp: kjskinselectorwidget.h kjguisettingswidget.h
-$(srcdir)/parser.cpp: kjskinselectorwidget.h kjguisettingswidget.h
|