]> git.pld-linux.org Git - packages/WindowMaker.git/blobdiff - WindowMaker-shared.patch
projects / packages / WindowMaker.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
- release 4,
[packages/WindowMaker.git] / WindowMaker-shared.patch
diff --git a/WindowMaker-shared.patch b/WindowMaker-shared.patch
index bc73c77f4e0d5695340fcab35e15710c07426b6c..c28494b8d959eb345c50638581ea5d87d5280933 100644 (file)
--- a/WindowMaker-shared.patch
+++ b/WindowMaker-shared.patch
@@ -1,24 +1,80 @@
-diff -Nru WindowMaker-0.63.1/WINGs/Makefile.am WindowMaker-0.63.1.new/WINGs/Makefile.am
---- WindowMaker-0.63.1/WINGs/Makefile.am       Sun Jan  7 00:21:58 2001
-+++ WindowMaker-0.63.1.new/WINGs/Makefile.am   Sun Jan  7 23:25:42 2001
-@@ -4,10 +4,6 @@
+diff -Nru WindowMaker-0.64.0/WINGs/Examples/Makefile.am WindowMaker-0.64.0.new/WINGs/Examples/Makefile.am
+--- WindowMaker-0.64.0/WINGs/Examples/Makefile.am      Tue Feb 13 18:58:56 2001
++++ WindowMaker-0.64.0.new/WINGs/Examples/Makefile.am  Tue Feb 13 18:56:19 2001
+@@ -6,22 +6,22 @@
+ noinst_PROGRAMS = connect server fontl puzzle
  
- SUBDIRS = . Documentation Resources Examples Extras Tests
+ 
+-LDADD= $(top_builddir)/WINGs/libWINGs.a $(top_builddir)/wrlib/libwraster.la \
++LDADD= $(top_builddir)/WINGs/libWINGs.la $(top_builddir)/wrlib/libwraster.la \
+       @LIBPL@
+ 
+ 
+-fontl_DEPENDENCIES = $(top_builddir)/WINGs/libWINGs.a
++fontl_DEPENDENCIES = $(top_builddir)/WINGs/libWINGs.la
+ 
+-puzzle_DEPENDENCIES = $(top_builddir)/WINGs/libWINGs.a
++puzzle_DEPENDENCIES = $(top_builddir)/WINGs/libWINGs.la
+ 
+-connect_DEPENDENCIES = $(top_builddir)/WINGs/libWUtil.a
++connect_DEPENDENCIES = $(top_builddir)/WINGs/libWUtil.la
+ 
+-connect_LDADD = $(top_builddir)/WINGs/libWUtil.a @LIBRARY_SEARCH_PATH@ \
++connect_LDADD = $(top_builddir)/WINGs/libWUtil.la @LIBRARY_SEARCH_PATH@ \
+       @NETLIBS@ @LIBPL@
+ 
+-server_DEPENDENCIES = $(top_builddir)/WINGs/libWUtil.a
++server_DEPENDENCIES = $(top_builddir)/WINGs/libWUtil.la
+ 
+-server_LDADD = $(top_builddir)/WINGs/libWUtil.a @LIBRARY_SEARCH_PATH@ \
++server_LDADD = $(top_builddir)/WINGs/libWUtil.la @LIBRARY_SEARCH_PATH@ \
+       @NETLIBS@ @LIBPL@
+ 
+ 
+diff -Nru WindowMaker-0.64.0/WINGs/Extras/Makefile.am WindowMaker-0.64.0.new/WINGs/Extras/Makefile.am
+--- WindowMaker-0.64.0/WINGs/Extras/Makefile.am        Tue Feb 13 18:58:56 2001
++++ WindowMaker-0.64.0.new/WINGs/Extras/Makefile.am    Tue Feb 13 18:56:19 2001
+@@ -10,13 +10,13 @@
+ include_HEADERS = wtableview.h wtabledelegates.h 
+ 
+ 
+-lib_LIBRARIES = libExtraWINGs.a 
++lib_LTLIBRARIES = libExtraWINGs.la
+ 
+ noinst_PROGRAMS = test
+ 
+ EXTRA_DIST = 
+ 
+-libExtraWINGs_a_SOURCES =     \
++libExtraWINGs_la_SOURCES =    \
+       wtableview.c \
+       wtabledelegates.c \
+       wtableview.h \
+@@ -26,7 +26,7 @@
+ INCLUDES = -I$(top_srcdir)/wrlib -I$(top_srcdir)/WINGs \
+       -DRESOURCE_PATH=\"$(datadir)/WINGs\" @HEADER_SEARCH_PATH@ -DDEBUG
+ 
+-LDADD= $(top_builddir)/WINGs/libWINGs.a $(top_builddir)/wrlib/libwraster.la \
++LDADD= $(top_builddir)/WINGs/libWINGs.la $(top_builddir)/wrlib/libwraster.la \
+         @LIBPL@ 
+ 
+ test_LDADD = wtableview.o wtabledelegates.o $(LDADD)
+diff -Nru WindowMaker-0.64.0/WINGs/Makefile.am WindowMaker-0.64.0.new/WINGs/Makefile.am
+--- WindowMaker-0.64.0/WINGs/Makefile.am       Tue Feb 13 18:58:56 2001
++++ WindowMaker-0.64.0.new/WINGs/Makefile.am   Tue Feb 13 19:00:21 2001
+@@ -4,22 +4,19 @@
+ 
+ SUBDIRS = WINGs . Documentation Resources Examples Extras Tests
  
 -
 -
 -#libWINGs_la_LDFLAGS = -version-info 1:1:0
 -
- # is this a kluge? if so, how should i do it?
- includedir = @includedir@/WINGs
- 
-@@ -15,16 +11,17 @@
- 
  bin_SCRIPTS = get-wings-flags get-wutil-flags
  
 -lib_LIBRARIES = libWINGs.a libWUtil.a
 -
-+lib_LIBRARIES = libWINGs.la libWUtil.la
++lib_LTLIBRARIES = libWINGs.la libWUtil.la
  
 -LDADD= libWINGs.a $(top_builddir)/wrlib/libwraster.la @LIBPL@
 +libWINGs_la_LDFLAGS = -version-info 1:1:0
@@ -31,21 +87,40 @@ diff -Nru WindowMaker-0.63.1/WINGs/Makefile.am WindowMaker-0.63.1.new/WINGs/Make
  # wbutton.c 
 -libWINGs_a_SOURCES =  \
 +libWINGs_la_SOURCES =         \
-       WINGs.h \
-       WINGsP.h \
        array.c \
-@@ -80,7 +77,7 @@
+       bagtree.c \
+       configuration.c \
+@@ -74,7 +71,7 @@
        wwindow.c
  
  
 -libWUtil_a_SOURCES =  \
 +libWUtil_la_SOURCES =         \
-       WINGs.h \
-       WINGsP.h \
        array.c \
-diff -Nru WindowMaker-0.63.1/WPrefs.app/Makefile.am WindowMaker-0.63.1.new/WPrefs.app/Makefile.am
---- WindowMaker-0.63.1/WPrefs.app/Makefile.am  Sun Jan  7 00:21:58 2001
-+++ WindowMaker-0.63.1.new/WPrefs.app/Makefile.am      Sun Jan  7 23:23:08 2001
+       bagtree.c \
+       connection.c \
+diff -Nru WindowMaker-0.64.0/WINGs/Tests/Makefile.am WindowMaker-0.64.0.new/WINGs/Tests/Makefile.am
+--- WindowMaker-0.64.0/WINGs/Tests/Makefile.am Tue Feb 13 18:58:56 2001
++++ WindowMaker-0.64.0.new/WINGs/Tests/Makefile.am     Tue Feb 13 18:56:19 2001
+@@ -4,13 +4,13 @@
+ 
+ noinst_PROGRAMS = wtest wmquery wmfile testmywidget testcolorpanel 
+ 
+-LDADD= $(top_builddir)/WINGs/libWINGs.a $(top_builddir)/wrlib/libwraster.la \
++LDADD= $(top_builddir)/WINGs/libWINGs.la $(top_builddir)/wrlib/libwraster.la \
+       @LIBPL@
+ 
+ 
+ testmywidget_SOURCES = testmywidget.c mywidget.c mywidget.h 
+ 
+-wtest_DEPENDENCIES = $(top_builddir)/WINGs/libWINGs.a
++wtest_DEPENDENCIES = $(top_builddir)/WINGs/libWINGs.la
+ 
+ 
+ EXTRA_DIST = logo.xpm upbtn.xpm wm.html wm.png
+diff -Nru WindowMaker-0.64.0/WPrefs.app/Makefile.am WindowMaker-0.64.0.new/WPrefs.app/Makefile.am
+--- WindowMaker-0.64.0/WPrefs.app/Makefile.am  Tue Feb 13 18:58:56 2001
++++ WindowMaker-0.64.0.new/WPrefs.app/Makefile.am      Tue Feb 13 18:56:19 2001
 @@ -46,10 +46,10 @@
  
  INCLUDES = -I$(top_srcdir)/wrlib -I$(top_srcdir)/WINGs @HEADER_SEARCH_PATH@ 
@@ -59,9 +134,9 @@ diff -Nru WindowMaker-0.63.1/WPrefs.app/Makefile.am WindowMaker-0.63.1.new/WPref
        $(top_builddir)/wrlib/libwraster.la \
        @LIBPL@ \
        @INTLIBS@
-diff -Nru WindowMaker-0.63.1/src/Makefile.am WindowMaker-0.63.1.new/src/Makefile.am
---- WindowMaker-0.63.1/src/Makefile.am Sun Jan  7 00:21:58 2001
-+++ WindowMaker-0.63.1.new/src/Makefile.am     Sun Jan  7 23:23:08 2001
+diff -Nru WindowMaker-0.64.0/src/Makefile.am WindowMaker-0.64.0.new/src/Makefile.am
+--- WindowMaker-0.64.0/src/Makefile.am Tue Feb 13 18:58:56 2001
++++ WindowMaker-0.64.0.new/src/Makefile.am     Tue Feb 13 18:56:19 2001
 @@ -113,7 +113,7 @@
  
  
@@ -71,9 +146,9 @@ diff -Nru WindowMaker-0.63.1/src/Makefile.am WindowMaker-0.63.1.new/src/Makefile
        $(top_builddir)/wrlib/libwraster.la\
        @LIBPL@ \
        @XLIBS@ \
-diff -Nru WindowMaker-0.63.1/test/Makefile.am WindowMaker-0.63.1.new/test/Makefile.am
---- WindowMaker-0.63.1/test/Makefile.am        Sun Jan  7 00:21:58 2001
-+++ WindowMaker-0.63.1.new/test/Makefile.am    Sun Jan  7 23:23:08 2001
+diff -Nru WindowMaker-0.64.0/test/Makefile.am WindowMaker-0.64.0.new/test/Makefile.am
+--- WindowMaker-0.64.0/test/Makefile.am        Tue Feb 13 18:58:56 2001
++++ WindowMaker-0.64.0.new/test/Makefile.am    Tue Feb 13 18:56:19 2001
 @@ -8,7 +8,7 @@
  
  wtest_SOURCES = wtest.c
@@ -83,10 +158,24 @@ diff -Nru WindowMaker-0.63.1/test/Makefile.am WindowMaker-0.63.1.new/test/Makefi
  
  
  INCLUDES = -g -D_BSD_SOURCE @XCFLAGS@ -I$(top_srcdir)/wmlib 
-diff -Nru WindowMaker-0.63.1/util/Makefile.am WindowMaker-0.63.1.new/util/Makefile.am
---- WindowMaker-0.63.1/util/Makefile.am        Sun Jan  7 00:21:58 2001
-+++ WindowMaker-0.63.1.new/util/Makefile.am    Sun Jan  7 23:23:08 2001
-@@ -46,7 +46,7 @@
+diff -Nru WindowMaker-0.64.0/util/Makefile.am WindowMaker-0.64.0.new/util/Makefile.am
+--- WindowMaker-0.64.0/util/Makefile.am        Tue Feb 13 18:58:56 2001
++++ WindowMaker-0.64.0.new/util/Makefile.am    Tue Feb 13 18:56:19 2001
+@@ -36,19 +36,19 @@
+ geticonset_LDADD= $(liblist)
+ 
+ wmagnify_LDADD = \
+-      $(top_builddir)/WINGs/libWINGs.a \
++      $(top_builddir)/WINGs/libWINGs.la \
+       $(top_builddir)/wrlib/libwraster.la \
+       @LIBPL@ \
+       @DLLIBS@
+ 
+ wmsetup_LDADD = \
+-      $(top_builddir)/WINGs/libWINGs.a \
++      $(top_builddir)/WINGs/libWINGs.la \
+       $(top_builddir)/wrlib/libwraster.la \
+       @LIBPL@ \
        @DLLIBS@
  
  wmsetbg_LDADD = \
@@ -95,15 +184,15 @@ diff -Nru WindowMaker-0.63.1/util/Makefile.am WindowMaker-0.63.1.new/util/Makefi
        $(top_builddir)/wrlib/libwraster.la \
        @LIBPL@ \
        @DLLIBS@
-diff -Nru WindowMaker-0.63.1/wmlib/Makefile.am WindowMaker-0.63.1.new/wmlib/Makefile.am
---- WindowMaker-0.63.1/wmlib/Makefile.am       Sun Jan  7 00:21:58 2001
-+++ WindowMaker-0.63.1.new/wmlib/Makefile.am   Sun Jan  7 23:23:51 2001
+diff -Nru WindowMaker-0.64.0/wmlib/Makefile.am WindowMaker-0.64.0.new/wmlib/Makefile.am
+--- WindowMaker-0.64.0/wmlib/Makefile.am       Tue Feb 13 18:58:56 2001
++++ WindowMaker-0.64.0.new/wmlib/Makefile.am   Tue Feb 13 18:56:19 2001
 @@ -1,13 +1,13 @@
  
  AUTOMAKE_OPTIONS = no-dependencies
  
 -lib_LIBRARIES = libWMaker.a
-+lib_LIBRARIES = libWMaker.la
++lib_LTLIBRARIES = libWMaker.la
  
  include_HEADERS = WMaker.h
  
NeXT-alike window manager
This page took 0.068152 seconds and 4 git commands to generate.