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