[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,31 +2,18 @@
 
 AUTOMAKE_OPTIONS = no-dependencies
 
-
 noinst_PROGRAMS = connect server fontl puzzle colorpick
 
+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@
-
-colorpick_DEPENDENCIES = $(top_builddir)/WINGs/libWINGs.a
-
-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,33 +2,28 @@
 
 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 
 
 AM_CFLAGS = @NOSTRICTALIASING@

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