kdelibs-am.patch

   1 --- kdoctools/Makefile.am.orig  Fri Jul  5 01:31:40 2002
   2 +++ kdoctools/Makefile.am       Fri Jul  5 02:34:17 2002
   3 @@ -12,6 +12,7 @@
   4
   5  kio_help_la_SOURCES = $(FILTER_sources) kio_help.cpp main.cpp xslt.cpp
   6  kio_help_la_LIBADD = $(LIBXSLT_LIBS) $(LIBXML_LIBS) $(FILTER_LIBS)
   7 +       kgzipfilter.lo kbzip2filter.lo kio_help.lo main.lo xslt.lo
   8  kio_help_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
   9  noinst_HEADERS = kio_help.h
  10
  11 @@ -19,11 +20,15 @@
  12  kdelnkdir = $(kde_servicesdir)
  13
  14  bin_PROGRAMS = meinproc xml2man
  15 -meinproc_LDADD = xslt_pure.o $(LIBXSLT_LIBS) $(LIBXML_LIBS) $(FILTER_LIBS)
  16 -meinproc_SOURCES = meinproc.cpp $(FILTER_sources)
  17 +meinproc_LDADD = xslt_pure.o $(LIBXSLT_LIBS) $(LIBXML_LIBS) $(FILTER_LIBS) \
  18 +       kgzipfilter.lo kbzip2filter.lo
  19 +
  20 +meinproc_SOURCES = meinproc.cpp
  21
  22  xml2man_LDADD = xslt_pure.o $(LIBXSLT_LIBS) $(LIBXML_LIBS) $(FILTER_LIBS)
  23 -xml2man_SOURCES = xml2man.cpp $(FILTER_sources)
  24 +       kgzipfilter.lo kbzip2filter.lo
  25 +
  26 +xml2man_SOURCES = xml2man.cpp
  27
  28  xslt_pure.o: xslt.cpp
  29         -rm -f xslt_pure.cpp
  30 --- khtml/Makefile.am.orig      Fri Jul  5 01:41:14 2002
  31 +++ khtml/Makefile.am   Fri Jul  5 02:24:11 2002
  32 @@ -41,11 +41,12 @@
  33         ./misc/libkhtmlmisc.la ./dom/libkhtmldom.la $(LIBKJAVA) \
  34         ../kio/libkio.la \
  35         $(top_builddir)/kparts/libkparts.la \
  36 -       $(top_builddir)/kdeprint/libkdeprint.la
  37 +       $(top_builddir)/kdeprint/libkdeprint.la
  38
  39  khtmlimagepart_la_SOURCES = khtmlimage.cpp
  40  khtmlimagepart_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries)
  41  khtmlimagepart_la_LIBADD = libkhtml.la
  42 +# khtmlimage.lo
  43
  44  INCLUDES = -I$(top_srcdir)/kjs -I$(top_srcdir)/kimgio \
  45         -I$(srcdir)/java -I$(top_srcdir)/dcop -I$(srcdir)/misc \
  46 @@ -83,8 +84,12 @@
  47  EXTRA_PROGRAMS = testcss testrender testkhtml_static test_regression
  48  testkhtml_SOURCES = testkhtml.cpp domtreeview.cpp
  49  testkhtml_LDADD = libkhtml.la
  50 -testkhtml_static_SOURCES = testkhtml.cpp domtreeview.cpp $(libkhtml_la_SOURCES)
  51 -testkhtml_static_LDADD = $(LIB_KDEUI) $(libkhtml_la_LIBADD)
  52 +testkhtml_static_SOURCES = testkhtml.cpp domtreeview.cpp
  53 +testkhtml_static_LDADD = $(LIB_KDEUI) $(libkhtml_la_LIBADD) \
  54 +       khtmlview.lo khtml_part.lo khtml_run.lo khtml_factory.lo \
  55 +       khtml_settings.lo khtml_events.lo khtml_find.lo khtml_ext.lo \
  56 +       khtml_pagecache.lo khtml_iface.lo khtml_printsettings.lo
  57 +
  58  testcss_SOURCES = testcss.cpp
  59  testcss_LDADD = libkhtml.la
  60  testrender_SOURCES = testrender.cpp
  61 --- kjs/Makefile.am.orig        Fri Jul  5 01:58:35 2002
  62 +++ kjs/Makefile.am     Fri Jul  5 02:29:29 2002
  63 @@ -41,7 +41,15 @@
  64                  function.h debugger.h property_map.h
  65
  66  libkjs_la_LDFLAGS = -version-info 1:0 -no-undefined $(USER_LDFLAGS) $(all_libraries)
  67 -libkjs_la_LIBADD = -lm $(LIBPCRE)
  68 +libkjs_la_LIBADD = -lm $(LIBPCRE) \
  69 +       ustring.lo internal.lo collector.lo nodes.lo \
  70 +       grammar.lo lexer.lo lookup.lo operations.lo \
  71 +       regexp.lo function_object.lo string_object.lo \
  72 +       bool_object.lo number_object.lo date_object.lo \
  73 +       array_object.lo math_object.lo object_object.lo \
  74 +       regexp_object.lo error_object.lo function.lo \
  75 +       debugger.lo value.lo types.lo object.lo \
  76 +       interpreter.lo property_map.lo nodes2string.lo
  77
  78  EXTRA_DIST = grammar.y
  79
  80 @@ -64,9 +72,27 @@
  81
  82  ## test program (in one program for easier profiling/memory debugging)
  83  EXTRA_PROGRAMS = testkjs_static testavl
  84 -testkjs_static_SOURCES = testkjs.cpp  $(libkjs_la_SOURCES)
  85 +testkjs_static_SOURCES = testkjs.cpp \
  86 +       ustring.lo internal.lo collector.lo nodes.lo \
  87 +       grammar.lo lexer.lo lookup.lo operations.lo \
  88 +       regexp.lo function_object.lo string_object.lo \
  89 +       bool_object.lo number_object.lo date_object.lo \
  90 +       array_object.lo math_object.lo object_object.lo \
  91 +       regexp_object.lo error_object.lo function.lo \
  92 +       debugger.lo value.lo types.lo object.lo \
  93 +       interpreter.lo property_map.lo nodes2string.lo
  94 +
  95  testkjs_static_LDADD = $(LIBPCRE)
  96 -testavl_SOURCES = testavl.cpp  $(libkjs_la_SOURCES)
  97 +testavl_SOURCES = testavl.cpp \
  98 +       ustring.lo internal.lo collector.lo nodes.lo \
  99 +       grammar.lo lexer.lo lookup.lo operations.lo \
 100 +       regexp.lo function_object.lo string_object.lo \
 101 +       bool_object.lo number_object.lo date_object.lo \
 102 +       array_object.lo math_object.lo object_object.lo \
 103 +       regexp_object.lo error_object.lo function.lo \
 104 +       debugger.lo value.lo types.lo object.lo \
 105 +       interpreter.lo property_map.lo nodes2string.lo
 106 +
 107  testavl_LDADD = $(LIBPCRE)
 108
 109  ## test program (linked to libkjs)
 110 --- kparts/tests/Makefile.am.orig       Fri Jul  5 02:00:43 2002
 111 +++ kparts/tests/Makefile.am    Fri Jul  5 02:38:21 2002
 112 @@ -5,8 +5,10 @@
 113
 114  check_PROGRAMS = kpartstest normalktmtest ghostviewtest
 115
 116 -kpartstest_SOURCES = example.cpp notepad.cpp parts.cpp
 117 -normalktmtest_SOURCES = normalktm.cpp notepad.cpp parts.cpp
 118 +kpartstest_SOURCES = example.cpp parts.cpp
 119 +kpartstest_LDADD = notepad.lo
 120 +normalktmtest_SOURCES = normalktm.cpp parts.cpp
 121 +normalktmtest_LDADD = notepad.lo
 122  ghostviewtest_SOURCES = ghostview.cpp
 123  ghostviewtest_LDADD = $(top_builddir)/kparts/libkparts.la $(LIB_KFILE)
 124