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
|
$NetBSD: patch-eq,v 1.7 2004/01/15 10:15:14 markd Exp $
--- legacyimport/Makefile.in.orig 2004-01-02 14:06:05.000000000 +1300
+++ legacyimport/Makefile.in
@@ -425,14 +425,18 @@ x_libraries = @x_libraries@
INCLUDES = $(all_includes)
bin_PROGRAMS = klegacyimport
-lib_LTLIBRARIES = klegacyimport.la
+lib_LTLIBRARIES = libklegacyimport_main.la klegacyimport.la
-klegacyimport_la_SOURCES = legacyimport.cpp
-klegacyimport_la_LIBADD = $(LIB_KDEUI) $(LIB_KIO)
+libklegacyimport_main_la_SOURCES = legacyimport.cpp
+libklegacyimport_main_la_LIBADD = $(LIB_KDEUI) $(LIB_KIO)
+libklegacyimport_main_la_LDFLAGS = $(all_libraries)
+
+klegacyimport_la_SOURCES = klegacyimport_main.cpp
+klegacyimport_la_LIBADD = libklegacyimport_main.la
klegacyimport_la_LDFLAGS = $(all_libraries) -module -avoid-version
-klegacyimport_SOURCES = dummy.cpp
-klegacyimport_LDADD = klegacyimport.la
+klegacyimport_SOURCES = klegacyimport_main.cpp
+klegacyimport_LDADD = libklegacyimport_main.la
klegacyimport_LDFLAGS = $(all_libraries) $(KDE_RPATH)
noinst_HEADERS = legacyimport.h
@@ -449,27 +453,35 @@ CONFIG_HEADER = $(top_builddir)/config.h
CONFIG_CLEAN_FILES =
LTLIBRARIES = $(lib_LTLIBRARIES)
-klegacyimport_la_DEPENDENCIES =
-am_klegacyimport_la_OBJECTS = legacyimport.lo
+klegacyimport_la_DEPENDENCIES = libklegacyimport_main.la
+am_klegacyimport_la_OBJECTS = klegacyimport_main.lo
#>- klegacyimport_la_OBJECTS = $(am_klegacyimport_la_OBJECTS)
#>+ 1
-klegacyimport_la_OBJECTS = legacyimport.lo
+klegacyimport_la_OBJECTS = klegacyimport_main.lo
+libklegacyimport_main_la_DEPENDENCIES =
+am_libklegacyimport_main_la_OBJECTS = legacyimport.lo
+#>- libklegacyimport_main_la_OBJECTS = \
+#>- $(am_libklegacyimport_main_la_OBJECTS)
+#>+ 1
+libklegacyimport_main_la_OBJECTS = legacyimport.lo
bin_PROGRAMS = klegacyimport$(EXEEXT)
PROGRAMS = $(bin_PROGRAMS)
-am_klegacyimport_OBJECTS = dummy.$(OBJEXT)
+am_klegacyimport_OBJECTS = klegacyimport_main.$(OBJEXT)
#>- klegacyimport_OBJECTS = $(am_klegacyimport_OBJECTS)
#>+ 1
-klegacyimport_OBJECTS = dummy.$(OBJEXT)
-klegacyimport_DEPENDENCIES = klegacyimport.la
+klegacyimport_OBJECTS = klegacyimport_main.$(OBJEXT)
+klegacyimport_DEPENDENCIES = libklegacyimport_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.Po \
+#>- @AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/klegacyimport_main.Plo \
+#>- @AMDEP_TRUE@ ./$(DEPDIR)/klegacyimport_main.Po \
#>- @AMDEP_TRUE@ ./$(DEPDIR)/legacyimport.Plo
-#>+ 3
-@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/dummy.Po \
+#>+ 4
+@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/klegacyimport_main.Plo \
+@AMDEP_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/klegacyimport_main.Po \
@AMDEP_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/legacyimport.Plo
#>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
@@ -490,13 +502,14 @@ CXXLD = $(CXX)
#>+ 2
CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \
$(AM_LDFLAGS) $(LDFLAGS) -o $@
-DIST_SOURCES = $(klegacyimport_la_SOURCES) $(klegacyimport_SOURCES)
+DIST_SOURCES = $(klegacyimport_la_SOURCES) \
+ $(libklegacyimport_main_la_SOURCES) $(klegacyimport_SOURCES)
DATA = $(apps_DATA)
HEADERS = $(noinst_HEADERS)
DIST_COMMON = $(noinst_HEADERS) Makefile.am Makefile.in
-SOURCES = $(klegacyimport_la_SOURCES) $(klegacyimport_SOURCES)
+SOURCES = $(klegacyimport_la_SOURCES) $(libklegacyimport_main_la_SOURCES) $(klegacyimport_SOURCES)
#>- all: all-am
#>+ 1
@@ -543,6 +556,8 @@ clean-libLTLIBRARIES:
done
klegacyimport.la: $(klegacyimport_la_OBJECTS) $(klegacyimport_la_DEPENDENCIES)
$(CXXLINK) -rpath $(libdir) $(klegacyimport_la_LDFLAGS) $(klegacyimport_la_OBJECTS) $(klegacyimport_la_LIBADD) $(LIBS)
+libklegacyimport_main.la: $(libklegacyimport_main_la_OBJECTS) $(libklegacyimport_main_la_DEPENDENCIES)
+ $(CXXLINK) -rpath $(libdir) $(libklegacyimport_main_la_LDFLAGS) $(libklegacyimport_main_la_OBJECTS) $(libklegacyimport_main_la_LIBADD) $(LIBS)
binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
install-binPROGRAMS: $(bin_PROGRAMS)
@$(NORMAL_INSTALL)
@@ -582,7 +597,8 @@ mostlyclean-compile:
distclean-compile:
-rm -f *.tab.c
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dummy.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/klegacyimport_main.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/klegacyimport_main.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/legacyimport.Plo@am__quote@
distclean-depend:
@@ -704,7 +720,7 @@ distclean-tags:
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
#>+ 4
-KDE_DIST=klegacyimport.desktop configure.in.in
+KDE_DIST=klegacyimport.desktop configure.in.in Makefile.in.rej dummy.cpp
DISTFILES= $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
|
