- more fixes in WINGs/Examples/Makefile.am.

[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,20 +6,20 @@
 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@ \
 	@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
@@ -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)
diff -Nru WindowMaker-0.64.0/WINGs/Makefile.am WindowMaker-0.64.0.new/WINGs/Makefile.am
--- WindowMaker-0.64.0/WINGs/Makefile.am	Tue Feb 13 18:58:56 2001
+++ WindowMaker-0.64.0.new/WINGs/Makefile.am	Tue Feb 13 19:00:21 2001
@@ -4,22 +4,19 @@
 
 SUBDIRS = WINGs . 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
-
+lib_LTLIBRARIES = libWINGs.la libWUtil.la
 
-LDADD= libWINGs.a $(top_builddir)/wrlib/libwraster.la @LIBPL@
+libWINGs_la_LDFLAGS = -version-info 1:1:0
+libWUtil_la_LDFLAGS = -version-info 1:1:0
 
+LDADD= libWINGs.la $(top_builddir)/wrlib/libwraster.la @LIBPL@
 
 EXTRA_DIST = BUGS
 
 # wbutton.c 
-libWINGs_a_SOURCES = 	\
+libWINGs_la_SOURCES = 	\
 	array.c \
 	bagtree.c \
 	configuration.c \
@@ -74,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