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