---- WindowMaker-0.61.1/WINGs/Makefile.am Sun Oct 3 00:17:29 1999
-+++ WindowMaker-0.61.1.shared/WINGs/Makefile.am Sun Oct 10 19:47:00 1999
-@@ -10,11 +10,12 @@
- -lm @LIBPL@
+--- 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
--#lib_LTLIBRARIES = libWINGs.la
-+lib_LTLIBRARIES = libWINGs.la libWUtil.la
+-
+ 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 @@
--lib_LIBRARIES = libWINGs.a libWUtil.a
-+#lib_LIBRARIES = libWINGs.a libWUtil.a
+ 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
-+libWINGs_la_LDFLAGS = -version-info 1:1:0
-+libWUtil_la_LDFLAGS = -version-info 1:1:0
-
- include_HEADERS = WINGs.h WUtil.h WINGsP.h
-
-@@ -22,36 +23,36 @@
+-
+ bin_SCRIPTS = get-wings-flags get-wutil-flags
- testmywidget_SOURCES = testmywidget.c mywidget.c mywidget.h
-
--testmywidget_LDADD = libWINGs.a $(LIBLIST)
-+testmywidget_LDADD = libWINGs.la $(LIBLIST)
+-lib_LIBRARIES = libWINGs.a libWUtil.a
++LDADD= libWINGs.la $(top_builddir)/wrlib/libwraster.la @INTLIBS@
- fontl_SOURCES = fontl.c
++lib_LTLIBRARIES = libWINGs.la libWUtil.la
++libWINGs_la_LIBADD = $(top_builddir)/wrlib/libwraster.la $(XFTLIBS)
--fontl_LDADD = libWINGs.a $(LIBLIST)
-+fontl_LDADD = libWINGs.la $(LIBLIST)
+-LDADD= libWINGs.a $(top_builddir)/wrlib/libwraster.la @INTLIBS@
- wtest_SOURCES = wtest.c
--wtest_LDADD = libWINGs.a $(LIBLIST)
-+wtest_LDADD = libWINGs.la $(LIBLIST)
+ EXTRA_DIST = BUGS python/Makefile python/README python/WINGs.i \
+ python/WINGs.py python/setup.py python/test.py
--wtest_DEPENDENCIES = libWINGs.a
-+wtest_DEPENDENCIES = libWINGs.la
- wmfile_SOURCES = wmfile.c
+ # wbutton.c
+-libWINGs_a_SOURCES = \
++libWINGs_la_SOURCES = \
+ array.c \
+ bagtree.c \
+ configuration.c \
+@@ -80,7 +78,7 @@
+ wwindow.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)
+-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
- wmquery_SOURCES = wmquery.c
+-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)
--wmquery_LDADD = libWINGs.a $(LIBLIST)
-+wmquery_LDADD = libWINGs.la $(LIBLIST)
+ 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
- EXTRA_DIST = logo.xpm BUGS
+ 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)
- # wbutton.c
--libWINGs_a_SOURCES = \
-+libWINGs_la_SOURCES = \
- WINGs.h \
- WINGsP.h \
- configuration.c \
-@@ -96,7 +97,7 @@
- usleep.c
+--- 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 @@
--libWUtil_a_SOURCES = \
-+libWUtil_la_SOURCES = \
- WINGs.h \
- WINGsP.h \
- bag.c \
---- WindowMaker-0.61.1/WPrefs.app/Makefile.am Wed Jun 2 00:25:45 1999
-+++ WindowMaker-0.61.1.shared/WPrefs.app/Makefile.am Sun Oct 10 19:38:53 1999
-@@ -49,10 +49,10 @@
- -I$(top_srcdir)/wrlib \
- -I$(top_srcdir)/WINGs @HEADER_SEARCH_PATH@
+ 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
- $(top_builddir)/WINGs/libWINGs.a\
+ $(top_builddir)/WINGs/libWINGs.la\
$(top_builddir)/wrlib/libwraster.la \
- @LIBRARY_SEARCH_PATH@ \
- @LIBPL@ \
---- WindowMaker-0.61.1/src/Makefile.am Thu Sep 16 04:58:56 1999
-+++ WindowMaker-0.61.1.shared/src/Makefile.am Sun Oct 10 19:33:45 1999
-@@ -111,7 +111,7 @@
+ @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\
- @LIBRARY_SEARCH_PATH@ \
- @LIBPL@ \
---- WindowMaker-0.61.1/test/Makefile.am Wed Jan 6 16:22:49 1999
-+++ WindowMaker-0.61.1.shared/test/Makefile.am Sun Oct 10 19:35:06 1999
+ @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
INCLUDES = -g -D_BSD_SOURCE @XCFLAGS@ -I$(top_srcdir)/wmlib
---- WindowMaker-0.61.1/util/Makefile.am Thu Sep 16 05:01:16 1999
-+++ WindowMaker-0.61.1.shared/util/Makefile.am Sun Oct 10 19:38:08 1999
-@@ -31,7 +31,7 @@
- geticonset_LDADD= $(liblist)
+--- 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 \
- @LIBRARY_SEARCH_PATH@ \
- @LIBPL@ \
---- WindowMaker-0.61.1/wmlib/Makefile.am Wed Sep 30 00:36:36 1998
-+++ WindowMaker-0.61.1.shared/wmlib/Makefile.am Sun Oct 10 19:36:39 1999
-@@ -1,13 +1,13 @@
+ @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@
+ INCLUDES = $(DFLAGS) @XCFLAGS@
-libWMaker_a_SOURCES = \
+libWMaker_la_SOURCES = \
menu.c \
app.c \
event.c \
-@@ -15,3 +15,4 @@
+@@ -15,6 +15,8 @@
app.h \
menu.h
+libWMaker_la_LDFLAGS = -version-info 1:1:1
++
+ DISTCLEANFILES = wmlib.pc
+
+ install-exec-local:
projects / packages / WindowMaker.git / blobdiff