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

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