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

diff -Nru WindowMaker-0.62.1/WINGs/Makefile.am WindowMaker-0.62.1.new/WINGs/Makefile.am
--- WindowMaker-0.62.1/WINGs/Makefile.am	Tue Aug  8 00:51:57 2000
+++ WindowMaker-0.62.1.new/WINGs/Makefile.am	Tue Aug  8 00:41:38 2000
@@ -10,11 +10,12 @@
 	-lm @LIBPL@
 
 
-#lib_LTLIBRARIES = libWINGs.la
+lib_LTLIBRARIES = libWINGs.la libWUtil.la
 
-lib_LIBRARIES = libWINGs.a libWUtil.a
+#lib_LIBRARIES = libWINGs.a libWUtil.la
 
-#libWINGs_la_LDFLAGS = -version-info 1:1:0
+libWINGs_la_LDFLAGS = -version-info 1:1:0
+libWUtil_la_LDFLAGS = -version-info 1:1:0
 
 include_HEADERS = WINGs.h WUtil.h WINGsP.h
 
@@ -24,39 +25,39 @@
 
 testmywidget_SOURCES = testmywidget.c mywidget.c mywidget.h
 
-testmywidget_LDADD = libWINGs.a $(LIBLIST)
+testmywidget_LDADD = libWINGs.la $(LIBLIST)
 
 fontl_SOURCES = fontl.c
 
-fontl_LDADD = libWINGs.a $(LIBLIST)
+fontl_LDADD = libWINGs.la $(LIBLIST)
 
 wtest_SOURCES = wtest.c
 
-wtest_LDADD = libWINGs.a $(LIBLIST)
+wtest_LDADD = libWINGs.la $(LIBLIST)
 
-wtest_DEPENDENCIES = libWINGs.a
+wtest_DEPENDENCIES = libWINGs.la
 
 wmfile_SOURCES = wmfile.c 
 
-wmfile_LDADD = libWINGs.a $(LIBLIST)
+wmfile_LDADD = libWINGs.la $(LIBLIST)
 	
 testcolorpanel_SOURCES = testcolorpanel.c
 
-testcolorpanel_LDADD = libWINGs.a $(LIBLIST)
+testcolorpanel_LDADD = libWINGs.la $(LIBLIST)
 
 wmquery_SOURCES = wmquery.c 
 
-wmquery_LDADD = libWINGs.a $(LIBLIST)
+wmquery_LDADD = libWINGs.la $(LIBLIST)
 
 connect_SOURCES = connect.c
 
-connect_LDADD = libWUtil.a @LIBRARY_SEARCH_PATH@ @NETLIBS@ @LIBPL@
+connect_LDADD = libWUtil.la @LIBRARY_SEARCH_PATH@ @NETLIBS@ @LIBPL@
 
 
 EXTRA_DIST = logo.xpm BUGS
 
 # wbutton.c 
-libWINGs_a_SOURCES = 	\
+libWINGs_la_SOURCES = 	\
 	WINGs.h \
 	WINGsP.h \
 	configuration.c \
@@ -108,7 +109,7 @@
 	usleep.c
 
 
-libWUtil_a_SOURCES = 	\
+libWUtil_la_SOURCES = 	\
 	WINGs.h \
 	WINGsP.h \
 	bagarray.c \
diff -Nru WindowMaker-0.62.1/src/Makefile.am WindowMaker-0.62.1.new/src/Makefile.am
--- WindowMaker-0.62.1/src/Makefile.am	Fri Jan 14 17:30:56 2000
+++ WindowMaker-0.62.1.new/src/Makefile.am	Tue Aug  8 00:52:09 2000
@@ -114,7 +114,7 @@
 
 
 wmaker_LDADD = \
-	$(top_builddir)/WINGs/libWINGs.a\
+	$(top_builddir)/WINGs/libWINGs.la\
 	$(top_builddir)/wrlib/libwraster.la\
 	@LIBRARY_SEARCH_PATH@ \
 	@LIBPL@ \
diff -Nru WindowMaker-0.62.1/test/Makefile.am WindowMaker-0.62.1.new/test/Makefile.am
--- WindowMaker-0.62.1/test/Makefile.am	Tue Aug  8 00:51:57 2000
+++ WindowMaker-0.62.1.new/test/Makefile.am	Tue Aug  8 00:41:38 2000
@@ -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.62.1/util/Makefile.am WindowMaker-0.62.1.new/util/Makefile.am
--- WindowMaker-0.62.1/util/Makefile.am	Tue Aug  8 00:51:57 2000
+++ WindowMaker-0.62.1.new/util/Makefile.am	Tue Aug  8 00:41:38 2000
@@ -31,7 +31,7 @@
 geticonset_LDADD= $(liblist)
 
 wmsetbg_LDADD = \
-	$(top_builddir)/WINGs/libWINGs.a \
+	$(top_builddir)/WINGs/libWINGs.la \
 	$(top_builddir)/wrlib/libwraster.la \
 	@LIBRARY_SEARCH_PATH@ \
 	@LIBPL@ \
diff -Nru WindowMaker-0.62.1/wmlib/Makefile.am WindowMaker-0.62.1.new/wmlib/Makefile.am
--- WindowMaker-0.62.1/wmlib/Makefile.am	Tue Aug  8 00:51:57 2000
+++ WindowMaker-0.62.1.new/wmlib/Makefile.am	Tue Aug  8 00:41:38 2000
@@ -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
diff -Nru WindowMaker-0.62.1/WPrefs.app/Makefile.am WindowMaker-0.62.1.new/WPrefs.app/Makefile.am
--- WindowMaker-0.62.1/WPrefs.app/Makefile.am	Sun Apr  2 23:18:15 2000
+++ WindowMaker-0.62.1.new/WPrefs.app/Makefile.am	Tue Aug  8 01:20:38 2000
@@ -48,10 +48,10 @@
 	-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 \
 	@LIBRARY_SEARCH_PATH@ \
 	@LIBPL@ \
Commit	Line	Data
b0f707bd	1	diff -Nru WindowMaker-0.62.1/WINGs/Makefile.am WindowMaker-0.62.1.new/WINGs/Makefile.am
	2	--- WindowMaker-0.62.1/WINGs/Makefile.am Tue Aug 8 00:51:57 2000
	3	+++ WindowMaker-0.62.1.new/WINGs/Makefile.am Tue Aug 8 00:41:38 2000
5a1d6215	4	@@ -10,11 +10,12 @@
32c7aa03 AF	5	-lm @LIBPL@
	6
	7
	8	-#lib_LTLIBRARIES = libWINGs.la
5a1d6215	9	+lib_LTLIBRARIES = libWINGs.la libWUtil.la
32c7aa03	10
5a1d6215	11	-lib_LIBRARIES = libWINGs.a libWUtil.a
b0f707bd	12	+#lib_LIBRARIES = libWINGs.a libWUtil.la
32c7aa03 AF	13
	14	-#libWINGs_la_LDFLAGS = -version-info 1:1:0
	15	+libWINGs_la_LDFLAGS = -version-info 1:1:0
5a1d6215	16	+libWUtil_la_LDFLAGS = -version-info 1:1:0
32c7aa03 AF	17
	18	include_HEADERS = WINGs.h WUtil.h WINGsP.h
	19
b0f707bd	20	@@ -24,39 +25,39 @@
32c7aa03 AF	21
	22	testmywidget_SOURCES = testmywidget.c mywidget.c mywidget.h
	23
	24	-testmywidget_LDADD = libWINGs.a $(LIBLIST)
	25	+testmywidget_LDADD = libWINGs.la $(LIBLIST)
	26
	27	fontl_SOURCES = fontl.c
	28
	29	-fontl_LDADD = libWINGs.a $(LIBLIST)
	30	+fontl_LDADD = libWINGs.la $(LIBLIST)
	31
	32	wtest_SOURCES = wtest.c
	33
	34	-wtest_LDADD = libWINGs.a $(LIBLIST)
	35	+wtest_LDADD = libWINGs.la $(LIBLIST)
	36
	37	-wtest_DEPENDENCIES = libWINGs.a
	38	+wtest_DEPENDENCIES = libWINGs.la
	39
	40	wmfile_SOURCES = wmfile.c
	41
	42	-wmfile_LDADD = libWINGs.a $(LIBLIST)
	43	+wmfile_LDADD = libWINGs.la $(LIBLIST)
	44
	45	testcolorpanel_SOURCES = testcolorpanel.c
	46
	47	-testcolorpanel_LDADD = libWINGs.a $(LIBLIST)
	48	+testcolorpanel_LDADD = libWINGs.la $(LIBLIST)
	49
32c7aa03 AF	50	wmquery_SOURCES = wmquery.c
	51
	52	-wmquery_LDADD = libWINGs.a $(LIBLIST)
	53	+wmquery_LDADD = libWINGs.la $(LIBLIST)
	54
b0f707bd	55	connect_SOURCES = connect.c
	56
	57	-connect_LDADD = libWUtil.a @LIBRARY_SEARCH_PATH@ @NETLIBS@ @LIBPL@
	58	+connect_LDADD = libWUtil.la @LIBRARY_SEARCH_PATH@ @NETLIBS@ @LIBPL@
	59
32c7aa03	60
5a1d6215	61	EXTRA_DIST = logo.xpm BUGS
32c7aa03 AF	62
	63	# wbutton.c
	64	-libWINGs_a_SOURCES = \
	65	+libWINGs_la_SOURCES = \
	66	WINGs.h \
	67	WINGsP.h \
	68	configuration.c \
b0f707bd	69	@@ -108,7 +109,7 @@
5a1d6215	70	usleep.c
	71
	72
	73	-libWUtil_a_SOURCES = \
	74	+libWUtil_la_SOURCES = \
	75	WINGs.h \
	76	WINGsP.h \
b0f707bd	77	bagarray.c \
	78	diff -Nru WindowMaker-0.62.1/src/Makefile.am WindowMaker-0.62.1.new/src/Makefile.am
	79	--- WindowMaker-0.62.1/src/Makefile.am Fri Jan 14 17:30:56 2000
	80	+++ WindowMaker-0.62.1.new/src/Makefile.am Tue Aug 8 00:52:09 2000
	81	@@ -114,7 +114,7 @@
32c7aa03 AF	82
	83
	84	wmaker_LDADD = \
	85	- $(top_builddir)/WINGs/libWINGs.a\
	86	+ $(top_builddir)/WINGs/libWINGs.la\
	87	$(top_builddir)/wrlib/libwraster.la\
	88	@LIBRARY_SEARCH_PATH@ \
	89	@LIBPL@ \
b0f707bd	90	diff -Nru WindowMaker-0.62.1/test/Makefile.am WindowMaker-0.62.1.new/test/Makefile.am
	91	--- WindowMaker-0.62.1/test/Makefile.am Tue Aug 8 00:51:57 2000
	92	+++ WindowMaker-0.62.1.new/test/Makefile.am Tue Aug 8 00:41:38 2000
32c7aa03 AF	93	@@ -8,7 +8,7 @@
	94
	95	wtest_SOURCES = wtest.c
	96
	97	-wtest_LDADD = $(top_builddir)/wmlib/libWMaker.a @XLFLAGS@ @XLIBS@
	98	+wtest_LDADD = $(top_builddir)/wmlib/libWMaker.la @XLFLAGS@ @XLIBS@
	99
	100
	101	INCLUDES = -g -D_BSD_SOURCE @XCFLAGS@ -I$(top_srcdir)/wmlib
b0f707bd	102	diff -Nru WindowMaker-0.62.1/util/Makefile.am WindowMaker-0.62.1.new/util/Makefile.am
	103	--- WindowMaker-0.62.1/util/Makefile.am Tue Aug 8 00:51:57 2000
	104	+++ WindowMaker-0.62.1.new/util/Makefile.am Tue Aug 8 00:41:38 2000
5a1d6215	105	@@ -31,7 +31,7 @@
	106	geticonset_LDADD= $(liblist)
	107
	108	wmsetbg_LDADD = \
	109	- $(top_builddir)/WINGs/libWINGs.a \
	110	+ $(top_builddir)/WINGs/libWINGs.la \
	111	$(top_builddir)/wrlib/libwraster.la \
	112	@LIBRARY_SEARCH_PATH@ \
	113	@LIBPL@ \
b0f707bd	114	diff -Nru WindowMaker-0.62.1/wmlib/Makefile.am WindowMaker-0.62.1.new/wmlib/Makefile.am
	115	--- WindowMaker-0.62.1/wmlib/Makefile.am Tue Aug 8 00:51:57 2000
	116	+++ WindowMaker-0.62.1.new/wmlib/Makefile.am Tue Aug 8 00:41:38 2000
32c7aa03 AF	117	@@ -1,13 +1,13 @@
	118
	119	AUTOMAKE_OPTIONS = no-dependencies
	120
	121	-lib_LIBRARIES = libWMaker.a
	122	+lib_LTLIBRARIES = libWMaker.la
	123
	124	include_HEADERS = WMaker.h
	125
	126	INCLUDES = @DFLAGS@ @XCFLAGS@
	127
	128	-libWMaker_a_SOURCES = \
	129	+libWMaker_la_SOURCES = \
	130	menu.c \
	131	app.c \
	132	event.c \
	133	@@ -15,3 +15,4 @@
	134	app.h \
	135	menu.h
	136
	137	+libWMaker_la_LDFLAGS = -version-info 1:1:1
b0f707bd	138	diff -Nru WindowMaker-0.62.1/WPrefs.app/Makefile.am WindowMaker-0.62.1.new/WPrefs.app/Makefile.am
	139	--- WindowMaker-0.62.1/WPrefs.app/Makefile.am Sun Apr 2 23:18:15 2000
	140	+++ WindowMaker-0.62.1.new/WPrefs.app/Makefile.am Tue Aug 8 01:20:38 2000
	141	@@ -48,10 +48,10 @@
	142	-I$(top_srcdir)/wrlib \
	143	-I$(top_srcdir)/WINGs @HEADER_SEARCH_PATH@
	144
	145	-WPrefs_DEPENDENCIES = $(top_builddir)/WINGs/libWINGs.a
	146	+WPrefs_DEPENDENCIES = $(top_builddir)/WINGs/libWINGs.la
	147
	148	WPrefs_LDADD = \
	149	- $(top_builddir)/WINGs/libWINGs.a\
	150	+ $(top_builddir)/WINGs/libWINGs.la\
	151	$(top_builddir)/wrlib/libwraster.la \
	152	@LIBRARY_SEARCH_PATH@ \
	153	@LIBPL@ \