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