summaryrefslogtreecommitdiff
path: root/x11/kdelibs3/patches/patch-ba
blob: c92bd4af4fd81071b344a8cbaeeaaccfced6c903 (plain)
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
$NetBSD: patch-ba,v 1.5 2003/05/22 02:42:42 markd Exp $

--- kinit/Makefile.in.orig	Thu May  8 05:24:09 2003
+++ kinit/Makefile.in
@@ -431,8 +431,7 @@ klauncher_la_LIBADD = $(LIB_KIO)
 klauncher_la_SOURCES = klauncher.cpp klauncher_main.cpp autostart.cpp
 
 klauncher_LDFLAGS = $(all_libraries) $(KDE_RPATH)
-klauncher_LDADD = klauncher.la
-klauncher_SOURCES = dummy.cpp
+klauncher_SOURCES = main.cpp
 
 #>- METASOURCES = AUTO
 
@@ -481,11 +480,12 @@ am_kioslave_OBJECTS = kioslave.$(OBJEXT)
 #>+ 1
 kioslave_OBJECTS = kioslave.$(OBJEXT)
 kioslave_DEPENDENCIES =
-am_klauncher_OBJECTS = dummy.$(OBJEXT)
+am_klauncher_OBJECTS = main.$(OBJEXT)
 #>- klauncher_OBJECTS = $(am_klauncher_OBJECTS)
 #>+ 1
-klauncher_OBJECTS = dummy.$(OBJEXT)
-klauncher_DEPENDENCIES = klauncher.la
+klauncher_OBJECTS = main.$(OBJEXT)
+klauncher_LDADD = $(LDADD)
+klauncher_DEPENDENCIES =
 am_kshell_OBJECTS = shell.$(OBJEXT)
 #>- kshell_OBJECTS = $(am_kshell_OBJECTS)
 #>+ 1
@@ -508,28 +508,25 @@ lnusertemp_DEPENDENCIES =
 DEFAULT_INCLUDES =  -I. -I$(srcdir) -I$(top_builddir)
 depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
 am__depfiles_maybe = depfiles
-#>- @AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/autostart.Plo ./$(DEPDIR)/dummy.Po \
-#>- @AMDEP_TRUE@	./$(DEPDIR)/kinit.Po ./$(DEPDIR)/kioslave.Po \
-#>- @AMDEP_TRUE@	./$(DEPDIR)/klauncher.Plo \
+#>- @AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/autostart.Plo ./$(DEPDIR)/kinit.Po \
+#>- @AMDEP_TRUE@	./$(DEPDIR)/kioslave.Po ./$(DEPDIR)/klauncher.Plo \
 #>- @AMDEP_TRUE@	./$(DEPDIR)/klauncher_main.Plo \
 #>- @AMDEP_TRUE@	./$(DEPDIR)/kwrapper.Po ./$(DEPDIR)/lnusertemp.Po \
-#>- @AMDEP_TRUE@	./$(DEPDIR)/setproctitle.Po ./$(DEPDIR)/shell.Po \
-#>- @AMDEP_TRUE@	./$(DEPDIR)/wrapper.Po
-#>+ 15
-@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@DEP_FILES =   $(DEPDIR)/klauncher_la.all_cpp.P $(DEPDIR)/kdeinit.all_cpp.P  ./$(DEPDIR)/autostart.Plo ./$(DEPDIR)/dummy.Po \
-@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@	@AMDEP_TRUE@	./$(DEPDIR)/kinit.Po ./$(DEPDIR)/kioslave.Po \
-@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@	@AMDEP_TRUE@	./$(DEPDIR)/klauncher.Plo \
+#>- @AMDEP_TRUE@	./$(DEPDIR)/main.Po ./$(DEPDIR)/setproctitle.Po \
+#>- @AMDEP_TRUE@	./$(DEPDIR)/shell.Po ./$(DEPDIR)/wrapper.Po
+#>+ 13
+@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@DEP_FILES =   $(DEPDIR)/klauncher_la.all_cpp.P $(DEPDIR)/kdeinit.all_cpp.P  ./$(DEPDIR)/autostart.Plo ./$(DEPDIR)/kinit.Po \
+@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@	@AMDEP_TRUE@	./$(DEPDIR)/kioslave.Po ./$(DEPDIR)/klauncher.Plo \
 @AMDEP_TRUE@@KDE_USE_FINAL_TRUE@	@AMDEP_TRUE@	./$(DEPDIR)/klauncher_main.Plo \
 @AMDEP_TRUE@@KDE_USE_FINAL_TRUE@	@AMDEP_TRUE@	./$(DEPDIR)/kwrapper.Po ./$(DEPDIR)/lnusertemp.Po \
-@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@	@AMDEP_TRUE@	./$(DEPDIR)/setproctitle.Po ./$(DEPDIR)/shell.Po \
-@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@	@AMDEP_TRUE@	./$(DEPDIR)/wrapper.Po
-@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@DEP_FILES =   ./$(DEPDIR)/autostart.Plo ./$(DEPDIR)/dummy.Po \
-@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@	@AMDEP_TRUE@	./$(DEPDIR)/kinit.Po ./$(DEPDIR)/kioslave.Po \
-@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@	@AMDEP_TRUE@	./$(DEPDIR)/klauncher.Plo \
+@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@	@AMDEP_TRUE@	./$(DEPDIR)/main.Po ./$(DEPDIR)/setproctitle.Po \
+@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@	@AMDEP_TRUE@	./$(DEPDIR)/shell.Po ./$(DEPDIR)/wrapper.Po
+@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@DEP_FILES =   ./$(DEPDIR)/autostart.Plo ./$(DEPDIR)/kinit.Po \
+@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@	@AMDEP_TRUE@	./$(DEPDIR)/kioslave.Po ./$(DEPDIR)/klauncher.Plo \
 @AMDEP_TRUE@@KDE_USE_FINAL_FALSE@	@AMDEP_TRUE@	./$(DEPDIR)/klauncher_main.Plo \
 @AMDEP_TRUE@@KDE_USE_FINAL_FALSE@	@AMDEP_TRUE@	./$(DEPDIR)/kwrapper.Po ./$(DEPDIR)/lnusertemp.Po \
-@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@	@AMDEP_TRUE@	./$(DEPDIR)/setproctitle.Po ./$(DEPDIR)/shell.Po \
-@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@	@AMDEP_TRUE@	./$(DEPDIR)/wrapper.Po
+@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@	@AMDEP_TRUE@	./$(DEPDIR)/main.Po ./$(DEPDIR)/setproctitle.Po \
+@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@	@AMDEP_TRUE@	./$(DEPDIR)/shell.Po ./$(DEPDIR)/wrapper.Po
 
 COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
 	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
@@ -678,13 +675,13 @@ distclean-compile:
 	-rm -f *.tab.c
 
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/autostart.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dummy.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/kinit.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/kioslave.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/klauncher.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/klauncher_main.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/kwrapper.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/lnusertemp.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/main.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/setproctitle.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/shell.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/wrapper.Po@am__quote@
@@ -887,7 +884,7 @@ distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
 #>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 #>+ 4
-KDE_DIST=README.DCOP LICENSE.setproctitle README.autostart README.wrapper startkde.example 
+KDE_DIST=startkde.example LICENSE.setproctitle README.wrapper README.autostart README.DCOP 
 
 DISTFILES= $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
 
@@ -1047,9 +1044,6 @@ uninstall-info: uninstall-info-recursive
 kwrapper.o: wrapper.c
 
 shell.o: wrapper.c
-
-dummy.cpp:
-	echo > dummy.cpp
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT: