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