[packages/WindowMaker.git] / WindowMaker-shared.patch

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
 
 
-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)
--- WindowMaker-0.65.1/WINGs/Makefile.am.orig	Wed Jun  6 22:22:55 2001
+++ WindowMaker-0.65.1/WINGs/Makefile.am	Thu Jul 26 12:05:30 2001
@@ -4,22 +4,16 @@
 
 SUBDIRS = WINGs . po Documentation Resources Examples Extras Tests
 
-
-
-#libWINGs_la_LDFLAGS = -version-info 1:1:0
-
 bin_SCRIPTS = get-wings-flags get-wutil-flags
 
-lib_LIBRARIES = libWINGs.a libWUtil.a
-
-
 LDADD= libWINGs.a $(top_builddir)/wrlib/libwraster.la @LIBPL@ @INTLIBS@
 
+lib_LTLIBRARIES = libWINGs.la libWUtil.la
 
 EXTRA_DIST = BUGS
 
 # wbutton.c 
-libWINGs_a_SOURCES = 	\
+libWINGs_la_SOURCES = 	\
 	array.c \
 	bagtree.c \
 	configuration.c \
@@ -77,7 +71,7 @@
 	wwindow.c
 
 
-libWUtil_a_SOURCES = 	\
+libWUtil_la_SOURCES = 	\
 	array.c \
 	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@ 
 
-WPrefs_DEPENDENCIES = $(top_builddir)/WINGs/libWINGs.a
+WPrefs_DEPENDENCIES = $(top_builddir)/WINGs/libWINGs.la
 
 WPrefs_LDADD = \
-	$(top_builddir)/WINGs/libWINGs.a\
+	$(top_builddir)/WINGs/libWINGs.la\
 	$(top_builddir)/wrlib/libwraster.la \
 	@LIBPL@ \
 	@INTLIBS@
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 @@
 
 
 wmaker_LDADD = \
-	$(top_builddir)/WINGs/libWINGs.a\
+	$(top_builddir)/WINGs/libWINGs.la\
 	$(top_builddir)/wrlib/libwraster.la\
 	@LIBPL@ \
 	@XLIBS@ \
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
 
-wtest_LDADD = $(top_builddir)/wmlib/libWMaker.a @XLFLAGS@ @XLIBS@ 
+wtest_LDADD = $(top_builddir)/wmlib/libWMaker.la @XLFLAGS@ @XLIBS@ 
 
 
 INCLUDES = -g -D_BSD_SOURCE @XCFLAGS@ -I$(top_srcdir)/wmlib 
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 = \
-	$(top_builddir)/WINGs/libWINGs.a \
+	$(top_builddir)/WINGs/libWINGs.la \
 	$(top_builddir)/wrlib/libwraster.la \
 	@LIBPL@ \
 	@DLLIBS@
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_LTLIBRARIES = libWMaker.la
 
 include_HEADERS = WMaker.h
 
 INCLUDES = $(DFLAGS) @XCFLAGS@
 
-libWMaker_a_SOURCES = 	\
+libWMaker_la_SOURCES = 	\
 	menu.c 		\
 	app.c 		\
 	event.c 	\
@@ -15,3 +15,4 @@
 	app.h		\
 	menu.h	
 
+libWMaker_la_LDFLAGS = -version-info 1:1:1
Commit	Line	Data
d2c9715f	1	diff -Nru WindowMaker-0.64.0/WINGs/Examples/Makefile.am WindowMaker-0.64.0.new/WINGs/Examples/Makefile.am
83b217de	2	--- WindowMaker-0.64.0/WINGs/Examples/Makefile.am Tue Feb 13 18:58:56 2001
83b217de	3	+++ WindowMaker-0.64.0.new/WINGs/Examples/Makefile.am Tue Feb 13 18:56:19 2001
7f2c3a0d	4	@@ -6,22 +6,22 @@
d2c9715f	5	noinst_PROGRAMS = connect server fontl puzzle
cceea408 SZ	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@
32c7aa03	25
8d088cb2	26	-server_DEPENDENCIES = $(top_builddir)/WINGs/libWUtil.a
	27	+server_DEPENDENCIES = $(top_builddir)/WINGs/libWUtil.la
	28
7f2c3a0d	29	-server_LDADD = $(top_builddir)/WINGs/libWUtil.a @LIBRARY_SEARCH_PATH@ \
7f2c3a0d	30	+server_LDADD = $(top_builddir)/WINGs/libWUtil.la @LIBRARY_SEARCH_PATH@ \
8d088cb2	31	@NETLIBS@ @LIBPL@
7f2c3a0d	32
7f2c3a0d	33
d2c9715f	34	diff -Nru WindowMaker-0.64.0/WINGs/Extras/Makefile.am WindowMaker-0.64.0.new/WINGs/Extras/Makefile.am
83b217de	35	--- WindowMaker-0.64.0/WINGs/Extras/Makefile.am Tue Feb 13 18:58:56 2001
83b217de	36	+++ WindowMaker-0.64.0.new/WINGs/Extras/Makefile.am Tue Feb 13 18:56:19 2001
7f2c3a0d	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 \
cceea408 SZ	53	@@ -26,7 +26,7 @@
	54	INCLUDES = -I$(top_srcdir)/wrlib -I$(top_srcdir)/WINGs \
	55	-DRESOURCE_PATH=\"$(datadir)/WINGs\" @HEADER_SEARCH_PATH@ -DDEBUG
32c7aa03	56
cceea408 SZ	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)
8a5e3c0d	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 @@
32c7aa03	65
8a5e3c0d	66	SUBDIRS = WINGs . po Documentation Resources Examples Extras Tests
32c7aa03	67
d2c9715f	68	-
83b217de	69	-
	70	-#libWINGs_la_LDFLAGS = -version-info 1:1:0
	71	-
	72	bin_SCRIPTS = get-wings-flags get-wutil-flags
d2c9715f	73
83b217de	74	-lib_LIBRARIES = libWINGs.a libWUtil.a
83b217de	75	-
8a5e3c0d	76	-
8a5e3c0d	77	LDADD= libWINGs.a $(top_builddir)/wrlib/libwraster.la @LIBPL@ @INTLIBS@
32c7aa03	78
8a5e3c0d	79	+lib_LTLIBRARIES = libWINGs.la libWUtil.la
cceea408	80
260b62b4	81	EXTRA_DIST = BUGS
32c7aa03 AF	82
	83	# wbutton.c
	84	-libWINGs_a_SOURCES = \
	85	+libWINGs_la_SOURCES = \
260b62b4	86	array.c \
d2c9715f	87	bagtree.c \
d2c9715f	88	configuration.c \
8a5e3c0d	89	@@ -77,7 +71,7 @@
260b62b4	90	wwindow.c
5a1d6215	91
	92
	93	-libWUtil_a_SOURCES = \
	94	+libWUtil_la_SOURCES = \
260b62b4	95	array.c \
d2c9715f	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
83b217de	99	--- WindowMaker-0.64.0/WINGs/Tests/Makefile.am Tue Feb 13 18:58:56 2001
83b217de	100	+++ WindowMaker-0.64.0.new/WINGs/Tests/Makefile.am Tue Feb 13 18:56:19 2001
cceea408 SZ	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
d2c9715f	117	diff -Nru WindowMaker-0.64.0/WPrefs.app/Makefile.am WindowMaker-0.64.0.new/WPrefs.app/Makefile.am
83b217de	118	--- WindowMaker-0.64.0/WPrefs.app/Makefile.am Tue Feb 13 18:58:56 2001
83b217de	119	+++ WindowMaker-0.64.0.new/WPrefs.app/Makefile.am Tue Feb 13 18:56:19 2001
260b62b4	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@
d2c9715f	133	diff -Nru WindowMaker-0.64.0/src/Makefile.am WindowMaker-0.64.0.new/src/Makefile.am
83b217de	134	--- WindowMaker-0.64.0/src/Makefile.am Tue Feb 13 18:58:56 2001
83b217de	135	+++ WindowMaker-0.64.0.new/src/Makefile.am Tue Feb 13 18:56:19 2001
260b62b4	136	@@ -113,7 +113,7 @@
32c7aa03 AF	137
	138
	139	wmaker_LDADD = \
	140	- $(top_builddir)/WINGs/libWINGs.a\
	141	+ $(top_builddir)/WINGs/libWINGs.la\
	142	$(top_builddir)/wrlib/libwraster.la\
32c7aa03	143	@LIBPL@ \
260b62b4	144	@XLIBS@ \
d2c9715f	145	diff -Nru WindowMaker-0.64.0/test/Makefile.am WindowMaker-0.64.0.new/test/Makefile.am
83b217de	146	--- WindowMaker-0.64.0/test/Makefile.am Tue Feb 13 18:58:56 2001
83b217de	147	+++ WindowMaker-0.64.0.new/test/Makefile.am Tue Feb 13 18:56:19 2001
32c7aa03 AF	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
d2c9715f	157	diff -Nru WindowMaker-0.64.0/util/Makefile.am WindowMaker-0.64.0.new/util/Makefile.am
83b217de	158	--- WindowMaker-0.64.0/util/Makefile.am Tue Feb 13 18:58:56 2001
83b217de	159	+++ WindowMaker-0.64.0.new/util/Makefile.am Tue Feb 13 18:56:19 2001
d2c9715f	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@ \
260b62b4	175	@DLLIBS@
5a1d6215	176
	177	wmsetbg_LDADD = \
	178	- $(top_builddir)/WINGs/libWINGs.a \
	179	+ $(top_builddir)/WINGs/libWINGs.la \
	180	$(top_builddir)/wrlib/libwraster.la \
5a1d6215	181	@LIBPL@ \
260b62b4	182	@DLLIBS@
d2c9715f	183	diff -Nru WindowMaker-0.64.0/wmlib/Makefile.am WindowMaker-0.64.0.new/wmlib/Makefile.am
83b217de	184	--- WindowMaker-0.64.0/wmlib/Makefile.am Tue Feb 13 18:58:56 2001
83b217de	185	+++ WindowMaker-0.64.0.new/wmlib/Makefile.am Tue Feb 13 18:56:19 2001
32c7aa03 AF	186	@@ -1,13 +1,13 @@
	187
	188	AUTOMAKE_OPTIONS = no-dependencies
	189
	190	-lib_LIBRARIES = libWMaker.a
cceea408	191	+lib_LTLIBRARIES = libWMaker.la
32c7aa03 AF	192
	193	include_HEADERS = WMaker.h
	194
260b62b4	195	INCLUDES = $(DFLAGS) @XCFLAGS@
32c7aa03 AF	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