a62b3e67a6
With apologies to Al I wouldn't know where to start with a summary of the changes between 2.1 and 2.2.1 - there are just too many. A couple of hopefully static URLS that contain useful information are http://www.kde.org/announcements/changelog2_1to2_2.html http://www.kde.org/announcements/changelog2_2to2_2_1.html Support for a.out for kde{libs,base} added by me. The libtool/a.out combination doesn't like the linking of modules into binaries. A better way of doing this will appear in future versions of KDE/pkgsrc.
51 lines
1.6 KiB
Text
51 lines
1.6 KiB
Text
$NetBSD: patch-cm,v 1.1 2001/10/15 22:46:05 skrll Exp $
|
|
|
|
--- konqueror/Makefile.am.orig Fri Jun 15 09:36:56 2001
|
|
+++ konqueror/Makefile.am
|
|
@@ -3,7 +3,7 @@
|
|
|
|
SUBDIRS = . kfmexec client iconview dirtree listview keditbookmarks kfindpart shellcmdplugin about pics sidebar
|
|
|
|
-lib_LTLIBRARIES = konqueror.la
|
|
+lib_LTLIBRARIES = libkonqueror_main.la konqueror.la
|
|
|
|
konqdatadir = $(kde_datadir)/konqueror
|
|
konqdata_DATA = konqueror.rc
|
|
@@ -20,7 +20,7 @@
|
|
|
|
bin_PROGRAMS = konqueror
|
|
|
|
-konqueror_la_SOURCES = konq_main.cc \
|
|
+libkonqueror_main_la_SOURCES = konq_main.cc \
|
|
KonquerorIface.cc KonquerorIface.skel \
|
|
KonqMainWindowIface.cc KonqMainWindowIface.skel \
|
|
KonqViewIface.cc KonqViewIface.skel \
|
|
@@ -34,11 +34,15 @@
|
|
konq_combo.cc \
|
|
konq_browseriface.cc
|
|
|
|
+libkonqueror_main_la_LDFLAGS = $(all_libraries) -module -avoid-version
|
|
+libkonqueror_main_la_LIBADD = ../libkonq/libkonq.la
|
|
+
|
|
+konqueror_la_SOURCES = konqueror_main.cc
|
|
konqueror_la_LDFLAGS = $(all_libraries) -module -avoid-version
|
|
-konqueror_la_LIBADD = ../libkonq/libkonq.la
|
|
+konqueror_la_LIBADD = libkonqueror_main.la ../libkonq/libkonq.la
|
|
|
|
-konqueror_SOURCES = dummy.cc
|
|
-konqueror_LDADD = konqueror.la
|
|
+konqueror_SOURCES = konqueror_main.cc
|
|
+konqueror_LDADD = libkonqueror_main.la
|
|
konqueror_LDFLAGS = $(KDE_RPATH) $(all_libraries)
|
|
|
|
# Hmm, this experiment of a static konq failed, don't trust it...
|
|
@@ -52,9 +56,6 @@
|
|
#konqueror_static_SOURCES = dummy.cc
|
|
#konqueror_static_LDADD = konqueror.la *view/*.la dirtree/*.la $(libdir)/libkhtml.la
|
|
#konqueror_static_LDFLAGS = $(all_libraries) -static
|
|
-
|
|
-dummy.cc:
|
|
- echo > dummy.cc
|
|
|
|
messages: rc.cpp
|
|
$(EXTRACTRC) */*.rc >> rc.cpp
|