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
|
$NetBSD: patch-bm,v 1.7 2004/01/15 10:15:14 markd Exp $
--- kicker/applets/launcher/Makefile.in.orig 2004-01-02 14:05:58.000000000 +1300
+++ kicker/applets/launcher/Makefile.in
@@ -438,7 +438,7 @@ lnk_DATA = quicklauncher.desktop
EXTRA_DIST = $(lnk_DATA)
launcher_panelapplet_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries)
-launcher_panelapplet_la_LIBADD = ../../kicker.la $(LIB_KSYCOCA) $(LIB_KDEUI)
+launcher_panelapplet_la_LIBADD = ../../libkicker_main.la $(LIB_KSYCOCA) $(LIB_KDEUI)
subdir = kicker/applets/launcher
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
@@ -446,7 +446,7 @@ CONFIG_HEADER = $(top_builddir)/config.h
CONFIG_CLEAN_FILES =
LTLIBRARIES = $(kde_module_LTLIBRARIES)
-launcher_panelapplet_la_DEPENDENCIES = ../../kicker.la
+launcher_panelapplet_la_DEPENDENCIES = ../../libkicker_main.la
am_launcher_panelapplet_la_OBJECTS = quicklauncher.lo quickbutton.lo \
quickaddappsmenu.lo
#>- launcher_panelapplet_la_OBJECTS = $(am_launcher_panelapplet_la_OBJECTS)
@@ -675,7 +675,7 @@ distclean-tags:
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
#>+ 4
-KDE_DIST=quicklauncher.desktop
+KDE_DIST=Makefile.in.rej quicklauncher.desktop
DISTFILES= $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
@@ -836,20 +836,20 @@ quickaddappsmenu.moc: $(srcdir)/quickadd
#>+ 1
mocs: quickaddappsmenu.moc
#>+ 3
-quickbutton.moc: $(srcdir)/quickbutton.h
- $(MOC) $(srcdir)/quickbutton.h -o quickbutton.moc
-
-#>+ 1
-mocs: quickbutton.moc
-#>+ 3
quicklauncher.moc: $(srcdir)/quicklauncher.h
$(MOC) $(srcdir)/quicklauncher.h -o quicklauncher.moc
#>+ 1
mocs: quicklauncher.moc
#>+ 3
+quickbutton.moc: $(srcdir)/quickbutton.h
+ $(MOC) $(srcdir)/quickbutton.h -o quickbutton.moc
+
+#>+ 1
+mocs: quickbutton.moc
+#>+ 3
clean-metasources:
- -rm -f quickaddappsmenu.moc quickbutton.moc quicklauncher.moc
+ -rm -f quickaddappsmenu.moc quicklauncher.moc quickbutton.moc
#>+ 3
clean-closures:
@@ -866,7 +866,7 @@ force-reedit:
#>+ 11
-launcher_panelapplet_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/quicklauncher.cpp $(srcdir)/quickbutton.cpp $(srcdir)/quickaddappsmenu.cpp quickbutton.moc quickaddappsmenu.moc quicklauncher.moc
+launcher_panelapplet_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/quicklauncher.cpp $(srcdir)/quickbutton.cpp $(srcdir)/quickaddappsmenu.cpp quicklauncher.moc quickaddappsmenu.moc quickbutton.moc
@echo 'creating launcher_panelapplet_la.all_cpp.cpp ...'; \
rm -f launcher_panelapplet_la.all_cpp.files launcher_panelapplet_la.all_cpp.final; \
echo "#define KDE_USE_FINAL 1" >> launcher_panelapplet_la.all_cpp.final; \
@@ -902,9 +902,9 @@ kde-rpo-clean:
-rm -f *.rpo
#>+ 7
-quicklauncher.lo: quicklauncher.moc
quicklauncher.o: quicklauncher.moc
-quickbutton.o: quickbutton.moc
quickaddappsmenu.lo: quickaddappsmenu.moc
+quickbutton.o: quickbutton.moc
quickaddappsmenu.o: quickaddappsmenu.moc
+quicklauncher.lo: quicklauncher.moc
quickbutton.lo: quickbutton.moc
|
