WindowMaker-shared.patch

   1 --- WindowMaker-0.80.0/WINGs/Examples/Makefile.am.orig  Thu Oct 11 11:59:54 2001
   2 +++ WindowMaker-0.80.0/WINGs/Examples/Makefile.am       Thu Jan  3 06:09:41 2002
   3 @@ -2,30 +2,18 @@
   4
   5  AUTOMAKE_OPTIONS = no-dependencies
   6
   7 -
   8  noinst_PROGRAMS = connect server fontl puzzle
   9
  10 +LDADD= $(top_builddir)/WINGs/libWINGs.la $(top_builddir)/wrlib/libwraster.la \
  11 +       $(INTLIBS)
  12
  13 -LDADD= $(top_builddir)/WINGs/libWINGs.a $(top_builddir)/wrlib/libwraster.la \
  14 -       @INTLIBS@
  15 -
  16 -
  17 -fontl_DEPENDENCIES = $(top_builddir)/WINGs/libWINGs.a
  18 -
  19 -puzzle_DEPENDENCIES = $(top_builddir)/WINGs/libWINGs.a
  20 -
  21 -connect_DEPENDENCIES = $(top_builddir)/WINGs/libWUtil.a
  22 -
  23 -connect_LDADD = $(top_builddir)/WINGs/libWUtil.a @LIBRARY_SEARCH_PATH@ \
  24 -       @NETLIBS@ @INTLIBS@
  25 -
  26 -server_DEPENDENCIES = $(top_builddir)/WINGs/libWUtil.a
  27 -
  28 -server_LDADD = $(top_builddir)/WINGs/libWUtil.a @LIBRARY_SEARCH_PATH@ \
  29 -       @NETLIBS@ @INTLIBS@
  30 +connect_LDADD = $(top_builddir)/WINGs/libWUtil.la $(LIBRARY_SEARCH_PATH) \
  31 +       $(NETLIBS) $(INTLIBS)
  32
  33 +server_LDADD = $(top_builddir)/WINGs/libWUtil.la $(LIBRARY_SEARCH_PATH) \
  34 +       $(NETLIBS) $(INTLIBS)
  35
  36  INCLUDES = -I$(top_srcdir)/WINGs -I$(top_srcdir)/wrlib -I$(top_srcdir)/src \
  37 -       -DRESOURCE_PATH=\"$(datadir)/WINGs\" @HEADER_SEARCH_PATH@ -DDEBUG
  38 +       -DRESOURCE_PATH=\"$(datadir)/WINGs\" $(HEADER_SEARCH_PATH) -DDEBUG
  39
  40
  41 --- WindowMaker-0.80.0/WINGs/Extras/Makefile.am.orig    Thu Oct 11 11:59:54 2001
  42 +++ WindowMaker-0.80.0/WINGs/Extras/Makefile.am Thu Jan  3 06:12:10 2002
  43 @@ -2,32 +2,25 @@
  44
  45  AUTOMAKE_OPTIONS = no-dependencies
  46
  47 -
  48 -
  49  # is this a kluge? if so, how should i do it?
  50  includedir = @includedir@/WINGs
  51
  52  include_HEADERS = wtableview.h wtabledelegates.h
  53
  54 -
  55 -lib_LIBRARIES = libExtraWINGs.a
  56 +lib_LTLIBRARIES = libExtraWINGs.la
  57
  58  noinst_PROGRAMS = test
  59
  60 -EXTRA_DIST =
  61 -
  62 -libExtraWINGs_a_SOURCES =      \
  63 +libExtraWINGs_la_SOURCES =     \
  64         wtableview.c \
  65         wtabledelegates.c \
  66         wtableview.h \
  67         wtabledelegates.h
  68
  69 -
  70  INCLUDES = -I$(top_srcdir)/wrlib -I$(top_srcdir)/WINGs \
  71 -       -DRESOURCE_PATH=\"$(datadir)/WINGs\" @HEADER_SEARCH_PATH@ -DDEBUG
  72 +       -DRESOURCE_PATH=\"$(datadir)/WINGs\" $(HEADER_SEARCH_PATH)
  73
  74 -LDADD= $(top_builddir)/WINGs/libWINGs.a $(top_builddir)/wrlib/libwraster.la \
  75 -       @INTLIBS@
  76 +LDADD= $(top_builddir)/WINGs/libWINGs.la $(top_builddir)/wrlib/libwraster.la \
  77 +       $(INTLIBS)
  78
  79  test_LDADD = wtableview.o wtabledelegates.o $(LDADD)
  80 -
  81 --- WindowMaker-0.70.0.orig/WINGs/Makefile.am   Thu Oct  4 05:39:17 2001
  82 +++ WindowMaker-0.70.0/WINGs/Makefile.am        Thu Oct 18 16:54:22 2001
  83 @@ -4,22 +4,18 @@
  84
  85  SUBDIRS = WINGs . po Documentation Resources Examples Extras Tests
  86
  87 -
  88 -
  89 -#libWINGs_la_LDFLAGS = -version-info 1:1:0
  90 -
  91  bin_SCRIPTS = get-wings-flags get-wutil-flags
  92
  93 -lib_LIBRARIES = libWINGs.a libWUtil.a
  94 +LDADD= libWINGs.a $(top_builddir)/wrlib/libwraster.la @INTLIBS@
  95
  96 +lib_LTLIBRARIES = libWINGs.la libWUtil.la
  97
  98 -LDADD= libWINGs.a $(top_builddir)/wrlib/libwraster.la @INTLIBS@
  99
 100
 101  EXTRA_DIST = BUGS
 102
 103  # wbutton.c
 104 -libWINGs_a_SOURCES =   \
 105 +libWINGs_la_SOURCES =  \
 106         array.c \
 107         bagtree.c \
 108         configuration.c \
 109 @@ -80,7 +76,7 @@
 110         wwindow.c
 111
 112
 113 -libWUtil_a_SOURCES =   \
 114 +libWUtil_la_SOURCES =  \
 115         array.c \
 116         bagtree.c \
 117         connection.c \
 118 --- WindowMaker-0.80.0/WINGs/Tests/Makefile.am.orig     Thu Oct 11 11:59:54 2001
 119 +++ WindowMaker-0.80.0/WINGs/Tests/Makefile.am  Thu Jan  3 06:14:31 2002
 120 @@ -4,18 +4,14 @@
 121
 122  noinst_PROGRAMS = wtest wmquery wmfile testmywidget
 123
 124 -LDADD= $(top_builddir)/WINGs/libWINGs.a $(top_builddir)/wrlib/libwraster.la \
 125 -       @INTLIBS@
 126 -
 127 +LDADD= $(top_builddir)/WINGs/libWINGs.la $(top_builddir)/wrlib/libwraster.la \
 128 +       $(INTLIBS)
 129
 130  testmywidget_SOURCES = testmywidget.c mywidget.c mywidget.h
 131
 132 -wtest_DEPENDENCIES = $(top_builddir)/WINGs/libWINGs.a
 133 -
 134 -
 135  EXTRA_DIST = logo.xpm upbtn.xpm wm.html wm.png
 136
 137  INCLUDES = -I$(top_srcdir)/WINGs -I$(top_srcdir)/wrlib -I$(top_srcdir)/src \
 138 -       -DRESOURCE_PATH=\"$(datadir)/WINGs\" @HEADER_SEARCH_PATH@ -DDEBUG
 139 +       -DRESOURCE_PATH=\"$(datadir)/WINGs\" $(HEADER_SEARCH_PATH)
 140
 141
 142 --- WindowMaker-0.70.0.orig/WPrefs.app/Makefile.am      Thu Oct  4 05:39:18 2001
 143 +++ WindowMaker-0.70.0/WPrefs.app/Makefile.am   Thu Oct 18 16:54:22 2001
 144 @@ -46,10 +46,10 @@
 145
 146  INCLUDES = -I$(top_srcdir)/wrlib -I$(top_srcdir)/WINGs @HEADER_SEARCH_PATH@
 147
 148 -WPrefs_DEPENDENCIES = $(top_builddir)/WINGs/libWINGs.a
 149 +WPrefs_DEPENDENCIES = $(top_builddir)/WINGs/libWINGs.la
 150
 151  WPrefs_LDADD = \
 152 -       $(top_builddir)/WINGs/libWINGs.a\
 153 +       $(top_builddir)/WINGs/libWINGs.la\
 154         $(top_builddir)/wrlib/libwraster.la \
 155         @INTLIBS@
 156
 157 diff -Nur WindowMaker-0.70.0.orig/src/Makefile.am WindowMaker-0.70.0/src/Makefile.am
 158 --- WindowMaker-0.70.0.orig/src/Makefile.am     Thu Oct  4 05:39:18 2001
 159 +++ WindowMaker-0.70.0/src/Makefile.am  Thu Oct 18 16:54:22 2001
 160 @@ -111,7 +111,7 @@
 161
 162
 163  wmaker_LDADD = \
 164 -       $(top_builddir)/WINGs/libWINGs.a\
 165 +       $(top_builddir)/WINGs/libWINGs.la\
 166         $(top_builddir)/wrlib/libwraster.la\
 167         @XLIBS@ \
 168         @INTLIBS@ \
 169 diff -Nur WindowMaker-0.70.0.orig/test/Makefile.am WindowMaker-0.70.0/test/Makefile.am
 170 --- WindowMaker-0.70.0.orig/test/Makefile.am    Sat Oct  2 23:16:11 1999
 171 +++ WindowMaker-0.70.0/test/Makefile.am Thu Oct 18 16:54:22 2001
 172 @@ -8,7 +8,7 @@
 173
 174  wtest_SOURCES = wtest.c
 175
 176 -wtest_LDADD = $(top_builddir)/wmlib/libWMaker.a @XLFLAGS@ @XLIBS@
 177 +wtest_LDADD = $(top_builddir)/wmlib/libWMaker.la @XLFLAGS@ @XLIBS@
 178
 179
 180  INCLUDES = -g -D_BSD_SOURCE @XCFLAGS@ -I$(top_srcdir)/wmlib
 181 --- WindowMaker-0.80.0/util/Makefile.am~        Thu Oct 11 11:59:54 2001
 182 +++ WindowMaker-0.80.0/util/Makefile.am Thu Jan  3 07:12:53 2002
 183 @@ -1,8 +1,6 @@
 184
 185  AUTOMAKE_OPTIONS = no-dependencies
 186
 187 -pkgdatadir  = $(datadir)/@PACKAGE@
 188 -
 189  bin_PROGRAMS = wxcopy wxpaste wdwrite wdread getstyle setstyle seticons geticonset wmsetbg wmsetup wmagnify
 190
 191  bin_SCRIPTS = wmaker.inst wm-oldmenu2new wsetfont wmchlocale wkdemenu.pl\
 192 @@ -12,44 +10,44 @@
 193                 wkdemenu.pl wmchlocale.in wcopy wpaste
 194
 195  INCLUDES = $(DFLAGS) -I$(top_srcdir)/WINGs -I$(top_srcdir)/wrlib \
 196 -       @HEADER_SEARCH_PATH@ \
 197 -       -DETCDIR=\"sysconfdir\" -DDATADIR=\"pkgdatadir\"
 198 +       $(HEADER_SEARCH_PATH) \
 199 +       -DETCDIR=\"$(sysconfdir)\" -DDATADIR=\"$(pkgdatadir)\"
 200
 201  # X_EXTRA_LIBS is for libproplist in systems that need -lsocket
 202  # remove after we require lPL 0.10.2 which automatically resolves its
 203  # library dependancies using the libPropList.la file
 204 -liblist= @LIBRARY_SEARCH_PATH@ @X_EXTRA_LIBS@ @INTLIBS@
 205 +liblist= $(LIBRARY_SEARCH_PATH) $(X_EXTRA_LIBS) $(INTLIBS)
 206
 207 -wdwrite_LDADD = $(top_builddir)/WINGs/libWUtil.a $(liblist)
 208 +wdwrite_LDADD = $(top_builddir)/WINGs/libWUtil.la $(liblist)
 209
 210 -wdread_LDADD = $(top_builddir)/WINGs/libWUtil.a $(liblist)
 211 +wdread_LDADD = $(top_builddir)/WINGs/libWUtil.la $(liblist)
 212
 213 -wxcopy_LDADD = @XLFLAGS@ @XLIBS@
 214 +wxcopy_LDADD = $(XLFLAGS) $(XLIBS)
 215
 216 -wxpaste_LDADD = @XLFLAGS@ @XLIBS@
 217 +wxpaste_LDADD = $(XLFLAGS) $(XLIBS)
 218
 219 -getstyle_LDADD = $(top_builddir)/WINGs/libWUtil.a $(liblist)
 220 +getstyle_LDADD = $(top_builddir)/WINGs/libWUtil.la $(liblist)
 221
 222  setstyle_LDADD = \
 223 -       $(top_builddir)/WINGs/libWUtil.a \
 224 -       @XLFLAGS@ @XLIBS@ $(liblist)
 225 +       $(top_builddir)/WINGs/libWUtil.la \
 226 +       $(XLFLAGS) $(XLIBS) $(liblist)
 227
 228 -seticons_LDADD= $(top_builddir)/WINGs/libWUtil.a $(liblist)
 229 +seticons_LDADD= $(top_builddir)/WINGs/libWUtil.la $(liblist)
 230
 231 -geticonset_LDADD= $(top_builddir)/WINGs/libWUtil.a $(liblist)
 232 +geticonset_LDADD= $(top_builddir)/WINGs/libWUtil.la $(liblist)
 233
 234  wmagnify_LDADD = \
 235 -       $(top_builddir)/WINGs/libWINGs.a \
 236 +       $(top_builddir)/WINGs/libWINGs.la \
 237         $(top_builddir)/wrlib/libwraster.la \
 238         @INTLIBS@ @DLLIBS@
 239
 240  wmsetup_LDADD = \
 241 -       $(top_builddir)/WINGs/libWINGs.a \
 242 +       $(top_builddir)/WINGs/libWINGs.la \
 243         $(top_builddir)/wrlib/libwraster.la \
 244         @INTLIBS@ @DLLIBS@
 245
 246  wmsetbg_LDADD = \
 247 -       $(top_builddir)/WINGs/libWINGs.a \
 248 +       $(top_builddir)/WINGs/libWINGs.la \
 249         $(top_builddir)/wrlib/libwraster.la \
 250         @INTLIBS@ @DLLIBS@
 251
 252 --- WindowMaker-0.70.0.orig/wmlib/Makefile.am   Mon Apr 10 02:59:35 2000
 253 +++ WindowMaker-0.70.0/wmlib/Makefile.am        Thu Oct 18 16:54:22 2001
 254 @@ -1,13 +1,13 @@
 255
 256  AUTOMAKE_OPTIONS = no-dependencies
 257
 258 -lib_LIBRARIES = libWMaker.a
 259 +lib_LTLIBRARIES = libWMaker.la
 260
 261  include_HEADERS = WMaker.h
 262
 263  INCLUDES = $(DFLAGS) @XCFLAGS@
 264
 265 -libWMaker_a_SOURCES =  \
 266 +libWMaker_la_SOURCES =         \
 267         menu.c          \
 268         app.c           \
 269         event.c         \
 270 @@ -15,3 +15,4 @@
 271         app.h           \
 272         menu.h
 273
 274 +libWMaker_la_LDFLAGS = -version-info 1:1:1