WindowMaker-shared.patch

   1 diff -Nru WindowMaker-0.64.0/WINGs/Examples/Makefile.am WindowMaker-0.64.0.new/WINGs/Examples/Makefile.am
   2 --- WindowMaker-0.64.0/WINGs/Examples/Makefile.am       Tue Feb 13 18:58:56 2001
   3 +++ WindowMaker-0.64.0.new/WINGs/Examples/Makefile.am   Tue Feb 13 18:56:19 2001
   4 @@ -6,20 +6,20 @@
   5  noinst_PROGRAMS = connect server fontl puzzle
   6
   7
   8 -LDADD= $(top_builddir)/WINGs/libWINGs.a $(top_builddir)/wrlib/libwraster.la \
   9 +LDADD= $(top_builddir)/WINGs/libWINGs.la $(top_builddir)/wrlib/libwraster.la \
  10         @LIBPL@
  11
  12
  13 -fontl_DEPENDENCIES = $(top_builddir)/WINGs/libWINGs.a
  14 +fontl_DEPENDENCIES = $(top_builddir)/WINGs/libWINGs.la
  15
  16 -puzzle_DEPENDENCIES = $(top_builddir)/WINGs/libWINGs.a
  17 +puzzle_DEPENDENCIES = $(top_builddir)/WINGs/libWINGs.la
  18
  19 -connect_DEPENDENCIES = $(top_builddir)/WINGs/libWUtil.a
  20 +connect_DEPENDENCIES = $(top_builddir)/WINGs/libWUtil.la
  21
  22 -connect_LDADD = $(top_builddir)/WINGs/libWUtil.a @LIBRARY_SEARCH_PATH@ \
  23 +connect_LDADD = $(top_builddir)/WINGs/libWUtil.la @LIBRARY_SEARCH_PATH@ \
  24         @NETLIBS@ @LIBPL@
  25
  26 -server_DEPENDENCIES = $(top_builddir)/WINGs/libWUtil.a
  27 +server_DEPENDENCIES = $(top_builddir)/WINGs/libWUtil.la
  28
  29  server_LDADD = $(top_builddir)/WINGs/libWUtil.a @LIBRARY_SEARCH_PATH@ \
  30         @NETLIBS@ @LIBPL@
  31 diff -Nru WindowMaker-0.64.0/WINGs/Extras/Makefile.am WindowMaker-0.64.0.new/WINGs/Extras/Makefile.am
  32 --- WindowMaker-0.64.0/WINGs/Extras/Makefile.am Tue Feb 13 18:58:56 2001
  33 +++ WindowMaker-0.64.0.new/WINGs/Extras/Makefile.am     Tue Feb 13 18:56:19 2001
  34 @@ -26,7 +26,7 @@
  35  INCLUDES = -I$(top_srcdir)/wrlib -I$(top_srcdir)/WINGs \
  36         -DRESOURCE_PATH=\"$(datadir)/WINGs\" @HEADER_SEARCH_PATH@ -DDEBUG
  37
  38 -LDADD= $(top_builddir)/WINGs/libWINGs.a $(top_builddir)/wrlib/libwraster.la \
  39 +LDADD= $(top_builddir)/WINGs/libWINGs.la $(top_builddir)/wrlib/libwraster.la \
  40          @LIBPL@
  41
  42  test_LDADD = wtableview.o wtabledelegates.o $(LDADD)
  43 diff -Nru WindowMaker-0.64.0/WINGs/Makefile.am WindowMaker-0.64.0.new/WINGs/Makefile.am
  44 --- WindowMaker-0.64.0/WINGs/Makefile.am        Tue Feb 13 18:58:56 2001
  45 +++ WindowMaker-0.64.0.new/WINGs/Makefile.am    Tue Feb 13 19:00:21 2001
  46 @@ -4,22 +4,19 @@
  47
  48  SUBDIRS = WINGs . Documentation Resources Examples Extras Tests
  49
  50 -
  51 -
  52 -#libWINGs_la_LDFLAGS = -version-info 1:1:0
  53 -
  54  bin_SCRIPTS = get-wings-flags get-wutil-flags
  55
  56 -lib_LIBRARIES = libWINGs.a libWUtil.a
  57 -
  58 +lib_LTLIBRARIES = libWINGs.la libWUtil.la
  59
  60 -LDADD= libWINGs.a $(top_builddir)/wrlib/libwraster.la @LIBPL@
  61 +libWINGs_la_LDFLAGS = -version-info 1:1:0
  62 +libWUtil_la_LDFLAGS = -version-info 1:1:0
  63
  64 +LDADD= libWINGs.la $(top_builddir)/wrlib/libwraster.la @LIBPL@
  65
  66  EXTRA_DIST = BUGS
  67
  68  # wbutton.c
  69 -libWINGs_a_SOURCES =   \
  70 +libWINGs_la_SOURCES =  \
  71         array.c \
  72         bagtree.c \
  73         configuration.c \
  74 @@ -74,7 +71,7 @@
  75         wwindow.c
  76
  77
  78 -libWUtil_a_SOURCES =   \
  79 +libWUtil_la_SOURCES =  \
  80         array.c \
  81         bagtree.c \
  82         connection.c \
  83 diff -Nru WindowMaker-0.64.0/WINGs/Tests/Makefile.am WindowMaker-0.64.0.new/WINGs/Tests/Makefile.am
  84 --- WindowMaker-0.64.0/WINGs/Tests/Makefile.am  Tue Feb 13 18:58:56 2001
  85 +++ WindowMaker-0.64.0.new/WINGs/Tests/Makefile.am      Tue Feb 13 18:56:19 2001
  86 @@ -4,13 +4,13 @@
  87
  88  noinst_PROGRAMS = wtest wmquery wmfile testmywidget testcolorpanel
  89
  90 -LDADD= $(top_builddir)/WINGs/libWINGs.a $(top_builddir)/wrlib/libwraster.la \
  91 +LDADD= $(top_builddir)/WINGs/libWINGs.la $(top_builddir)/wrlib/libwraster.la \
  92         @LIBPL@
  93
  94
  95  testmywidget_SOURCES = testmywidget.c mywidget.c mywidget.h
  96
  97 -wtest_DEPENDENCIES = $(top_builddir)/WINGs/libWINGs.a
  98 +wtest_DEPENDENCIES = $(top_builddir)/WINGs/libWINGs.la
  99
 100
 101  EXTRA_DIST = logo.xpm upbtn.xpm wm.html wm.png
 102 diff -Nru WindowMaker-0.64.0/WPrefs.app/Makefile.am WindowMaker-0.64.0.new/WPrefs.app/Makefile.am
 103 --- WindowMaker-0.64.0/WPrefs.app/Makefile.am   Tue Feb 13 18:58:56 2001
 104 +++ WindowMaker-0.64.0.new/WPrefs.app/Makefile.am       Tue Feb 13 18:56:19 2001
 105 @@ -46,10 +46,10 @@
 106
 107  INCLUDES = -I$(top_srcdir)/wrlib -I$(top_srcdir)/WINGs @HEADER_SEARCH_PATH@
 108
 109 -WPrefs_DEPENDENCIES = $(top_builddir)/WINGs/libWINGs.a
 110 +WPrefs_DEPENDENCIES = $(top_builddir)/WINGs/libWINGs.la
 111
 112  WPrefs_LDADD = \
 113 -       $(top_builddir)/WINGs/libWINGs.a\
 114 +       $(top_builddir)/WINGs/libWINGs.la\
 115         $(top_builddir)/wrlib/libwraster.la \
 116         @LIBPL@ \
 117         @INTLIBS@
 118 diff -Nru WindowMaker-0.64.0/src/Makefile.am WindowMaker-0.64.0.new/src/Makefile.am
 119 --- WindowMaker-0.64.0/src/Makefile.am  Tue Feb 13 18:58:56 2001
 120 +++ WindowMaker-0.64.0.new/src/Makefile.am      Tue Feb 13 18:56:19 2001
 121 @@ -113,7 +113,7 @@
 122
 123
 124  wmaker_LDADD = \
 125 -       $(top_builddir)/WINGs/libWINGs.a\
 126 +       $(top_builddir)/WINGs/libWINGs.la\
 127         $(top_builddir)/wrlib/libwraster.la\
 128         @LIBPL@ \
 129         @XLIBS@ \
 130 diff -Nru WindowMaker-0.64.0/test/Makefile.am WindowMaker-0.64.0.new/test/Makefile.am
 131 --- WindowMaker-0.64.0/test/Makefile.am Tue Feb 13 18:58:56 2001
 132 +++ WindowMaker-0.64.0.new/test/Makefile.am     Tue Feb 13 18:56:19 2001
 133 @@ -8,7 +8,7 @@
 134
 135  wtest_SOURCES = wtest.c
 136
 137 -wtest_LDADD = $(top_builddir)/wmlib/libWMaker.a @XLFLAGS@ @XLIBS@
 138 +wtest_LDADD = $(top_builddir)/wmlib/libWMaker.la @XLFLAGS@ @XLIBS@
 139
 140
 141  INCLUDES = -g -D_BSD_SOURCE @XCFLAGS@ -I$(top_srcdir)/wmlib
 142 diff -Nru WindowMaker-0.64.0/util/Makefile.am WindowMaker-0.64.0.new/util/Makefile.am
 143 --- WindowMaker-0.64.0/util/Makefile.am Tue Feb 13 18:58:56 2001
 144 +++ WindowMaker-0.64.0.new/util/Makefile.am     Tue Feb 13 18:56:19 2001
 145 @@ -36,19 +36,19 @@
 146  geticonset_LDADD= $(liblist)
 147
 148  wmagnify_LDADD = \
 149 -       $(top_builddir)/WINGs/libWINGs.a \
 150 +       $(top_builddir)/WINGs/libWINGs.la \
 151         $(top_builddir)/wrlib/libwraster.la \
 152         @LIBPL@ \
 153         @DLLIBS@
 154
 155  wmsetup_LDADD = \
 156 -       $(top_builddir)/WINGs/libWINGs.a \
 157 +       $(top_builddir)/WINGs/libWINGs.la \
 158         $(top_builddir)/wrlib/libwraster.la \
 159         @LIBPL@ \
 160         @DLLIBS@
 161
 162  wmsetbg_LDADD = \
 163 -       $(top_builddir)/WINGs/libWINGs.a \
 164 +       $(top_builddir)/WINGs/libWINGs.la \
 165         $(top_builddir)/wrlib/libwraster.la \
 166         @LIBPL@ \
 167         @DLLIBS@
 168 diff -Nru WindowMaker-0.64.0/wmlib/Makefile.am WindowMaker-0.64.0.new/wmlib/Makefile.am
 169 --- WindowMaker-0.64.0/wmlib/Makefile.am        Tue Feb 13 18:58:56 2001
 170 +++ WindowMaker-0.64.0.new/wmlib/Makefile.am    Tue Feb 13 18:56:19 2001
 171 @@ -1,13 +1,13 @@
 172
 173  AUTOMAKE_OPTIONS = no-dependencies
 174
 175 -lib_LIBRARIES = libWMaker.a
 176 +lib_LTLIBRARIES = libWMaker.la
 177
 178  include_HEADERS = WMaker.h
 179
 180  INCLUDES = $(DFLAGS) @XCFLAGS@
 181
 182 -libWMaker_a_SOURCES =  \
 183 +libWMaker_la_SOURCES =         \
 184         menu.c          \
 185         app.c           \
 186         event.c         \
 187 @@ -15,3 +15,4 @@
 188         app.h           \
 189         menu.h
 190
 191 +libWMaker_la_LDFLAGS = -version-info 1:1:1