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
|
$NetBSD: patch-bk,v 1.6 2004/01/15 10:15:14 markd Exp $
--- kicker/Makefile.in.orig 2004-01-02 14:05:58.000000000 +1300
+++ kicker/Makefile.in
@@ -427,19 +427,23 @@ INCLUDES = $(all_includes)
SUBDIRS = share core ui buttons . proxy taskmanager taskbar applets extensions menuext data
bin_PROGRAMS = kicker
-lib_LTLIBRARIES = kicker.la
+lib_LTLIBRARIES = libkicker_main.la kicker.la
CLEANFILES = dummy.cpp dummy_la.cpp
-kicker_la_LIBADD = core/libkicker_core.la buttons/libkicker_buttons.la \
+libkicker_main_la_LIBADD = core/libkicker_core.la buttons/libkicker_buttons.la \
ui/libkicker_ui.la share/libkickermain.la $(LIB_KIO)
-kicker_la_SOURCES = dummy.cpp
-kicker_la_LDFLAGS = $(KDE_PLUGIN) -no-undefined -module $(all_libraries)
+libkicker_main_la_SOURCES = dummy.cpp
+libkicker_main_la_LDFLAGS = $(KDE_PLUGIN) $(all_libraries)
-kicker_LDADD = kicker.la
-kicker_SOURCES = dummy_la.cpp
+kicker_la_LIBADD = libkicker_main.la
+kicker_la_SOURCES = kicker_main.cpp
+kicker_la_LDFLAGS = -module $(all_libraries)
+
+kicker_LDADD = libkicker_main.la
+kicker_SOURCES = kicker_main.cpp
kicker_LDFLAGS = $(all_libraries) $(KDE_RPATH)
autostart_DATA = panel.desktop
@@ -457,28 +461,37 @@ CONFIG_HEADER = $(top_builddir)/config.h
CONFIG_CLEAN_FILES =
LTLIBRARIES = $(lib_LTLIBRARIES)
-kicker_la_DEPENDENCIES = core/libkicker_core.la \
+kicker_la_DEPENDENCIES = libkicker_main.la
+am_kicker_la_OBJECTS = kicker_main.lo
+#>- kicker_la_OBJECTS = $(am_kicker_la_OBJECTS)
+#>+ 1
+kicker_la_OBJECTS = kicker_main.lo
+libkicker_main_la_DEPENDENCIES = core/libkicker_core.la \
buttons/libkicker_buttons.la ui/libkicker_ui.la \
share/libkickermain.la
-am_kicker_la_OBJECTS = dummy.lo
-#>- kicker_la_OBJECTS = $(am_kicker_la_OBJECTS)
+am_libkicker_main_la_OBJECTS = dummy.lo
+#>- libkicker_main_la_OBJECTS = $(am_libkicker_main_la_OBJECTS)
#>+ 1
-kicker_la_OBJECTS = dummy.lo
+libkicker_main_la_OBJECTS = dummy.lo
bin_PROGRAMS = kicker$(EXEEXT)
PROGRAMS = $(bin_PROGRAMS)
-am_kicker_OBJECTS = dummy_la.$(OBJEXT)
+am_kicker_OBJECTS = kicker_main.$(OBJEXT)
#>- kicker_OBJECTS = $(am_kicker_OBJECTS)
#>+ 1
-kicker_OBJECTS = dummy_la.$(OBJEXT)
-kicker_DEPENDENCIES = kicker.la
+kicker_OBJECTS = kicker_main.$(OBJEXT)
+kicker_DEPENDENCIES = libkicker_main.la
DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
am__depfiles_maybe = depfiles
-#>- @AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/dummy.Plo ./$(DEPDIR)/dummy_la.Po
-#>+ 2
-@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/dummy.Plo ./$(DEPDIR)/dummy_la.Po
+#>- @AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/dummy.Plo \
+#>- @AMDEP_TRUE@ ./$(DEPDIR)/kicker_main.Plo \
+#>- @AMDEP_TRUE@ ./$(DEPDIR)/kicker_main.Po
+#>+ 4
+@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/dummy.Plo \
+@AMDEP_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kicker_main.Plo \
+@AMDEP_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kicker_main.Po
#>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
#>- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
@@ -498,7 +511,8 @@ CXXLD = $(CXX)
#>+ 2
CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \
$(AM_LDFLAGS) $(LDFLAGS) -o $@
-DIST_SOURCES = $(kicker_la_SOURCES) $(kicker_SOURCES)
+DIST_SOURCES = $(kicker_la_SOURCES) $(libkicker_main_la_SOURCES) \
+ $(kicker_SOURCES)
DATA = $(autostart_DATA) $(config_DATA) $(update_DATA)
@@ -509,7 +523,7 @@ RECURSIVE_TARGETS = info-recursive dvi-r
check-recursive installcheck-recursive
DIST_COMMON = AUTHORS ChangeLog Makefile.am Makefile.in
DIST_SUBDIRS = $(SUBDIRS)
-SOURCES = $(kicker_la_SOURCES) $(kicker_SOURCES)
+SOURCES = $(kicker_la_SOURCES) $(libkicker_main_la_SOURCES) $(kicker_SOURCES)
#>- all: all-recursive
#>+ 1
@@ -554,11 +568,13 @@ clean-libLTLIBRARIES:
echo "rm -f \"$${dir}/so_locations\""; \
rm -f "$${dir}/so_locations"; \
done
-#>- kicker.la: $(kicker_la_OBJECTS) $(kicker_la_DEPENDENCIES)
-#>+ 2
-@KDE_USE_CLOSURE_TRUE@kicker.la: kicker.la.closure $(kicker_la_OBJECTS) $(kicker_la_DEPENDENCIES)
-@KDE_USE_CLOSURE_FALSE@kicker.la: $(kicker_la_OBJECTS) $(kicker_la_DEPENDENCIES)
+kicker.la: $(kicker_la_OBJECTS) $(kicker_la_DEPENDENCIES)
$(CXXLINK) -rpath $(libdir) $(kicker_la_LDFLAGS) $(kicker_la_OBJECTS) $(kicker_la_LIBADD) $(LIBS)
+#>- libkicker_main.la: $(libkicker_main_la_OBJECTS) $(libkicker_main_la_DEPENDENCIES)
+#>+ 2
+@KDE_USE_CLOSURE_TRUE@libkicker_main.la: libkicker_main.la.closure $(libkicker_main_la_OBJECTS) $(libkicker_main_la_DEPENDENCIES)
+@KDE_USE_CLOSURE_FALSE@libkicker_main.la: $(libkicker_main_la_OBJECTS) $(libkicker_main_la_DEPENDENCIES)
+ $(CXXLINK) -rpath $(libdir) $(libkicker_main_la_LDFLAGS) $(libkicker_main_la_OBJECTS) $(libkicker_main_la_LIBADD) $(LIBS)
binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
install-binPROGRAMS: $(bin_PROGRAMS)
@$(NORMAL_INSTALL)
@@ -599,7 +615,8 @@ distclean-compile:
-rm -f *.tab.c
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dummy.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dummy_la.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/kicker_main.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/kicker_main.Po@am__quote@
distclean-depend:
-rm -rf ./$(DEPDIR)
@@ -826,7 +843,7 @@ distclean-tags:
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
#>+ 4
-KDE_DIST=kickerrc.upd panel.desktop kicker-3.1-properSizeSetting.pl kcmkicker.desktop
+KDE_DIST=kicker-3.1-properSizeSetting.pl kcmkicker.desktop Makefile.in.rej kickerrc.upd panel.desktop
DISTFILES= $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
@@ -998,17 +1015,17 @@ dummy.cpp dummy_la.cpp:
.NOEXPORT:
#>+ 8
-kicker.la.closure: $(kicker_la_OBJECTS) $(kicker_la_DEPENDENCIES)
- @echo "int main() {return 0;}" > kicker_la_closure.cpp
- @$(LTCXXCOMPILE) -c kicker_la_closure.cpp
- $(CXXLINK) kicker_la_closure.lo $(kicker_la_LDFLAGS) $(kicker_la_OBJECTS) $(kicker_la_LIBADD) $(LIBS)
- @rm -f kicker_la_closure.* kicker.la.closure
- @echo "timestamp" > kicker.la.closure
+libkicker_main.la.closure: $(libkicker_main_la_OBJECTS) $(libkicker_main_la_DEPENDENCIES)
+ @echo "int main() {return 0;}" > libkicker_main_la_closure.cpp
+ @$(LTCXXCOMPILE) -c libkicker_main_la_closure.cpp
+ $(CXXLINK) libkicker_main_la_closure.lo $(libkicker_main_la_LDFLAGS) $(libkicker_main_la_OBJECTS) $(libkicker_main_la_LIBADD) $(LIBS)
+ @rm -f libkicker_main_la_closure.* libkicker_main.la.closure
+ @echo "timestamp" > libkicker_main.la.closure
#>+ 3
clean-closures:
- -rm -f kicker.la.closure
+ -rm -f libkicker_main.la.closure
#>+ 2
docs-am:
|
