From 71f1d7f101ed27a0e4c563c194f07e4e44094523 Mon Sep 17 00:00:00 2001 From: dan Date: Thu, 6 Jan 2005 15:48:42 +0000 Subject: [PATCH] fix to allow parallel builds on SMP systems using make -j --- ChangeLog | 1 + FAQ | 2 +- configure.ac | 3 ++- wrlib/.cvsignore | 2 +- wrlib/Makefile.am | 25 ++----------------------- wrlib/{ => tests}/.cvsignore | 3 +-- wrlib/tests/Makefile.am | 25 +++++++++++++++++++++++++ wrlib/{ => tests}/ballot_box.xpm | 0 wrlib/{ => tests}/test.png | Bin wrlib/{ => tests}/testdraw.c | 0 wrlib/{ => tests}/testgrad.c | 0 wrlib/{ => tests}/testrot.c | 0 wrlib/{ => tests}/tile.xpm | 0 wrlib/{ => tests}/view.c | 0 14 files changed, 33 insertions(+), 28 deletions(-) copy wrlib/{ => tests}/.cvsignore (56%) create mode 100644 wrlib/tests/Makefile.am rename wrlib/{ => tests}/ballot_box.xpm (100%) rename wrlib/{ => tests}/test.png (100%) rename wrlib/{ => tests}/testdraw.c (100%) rename wrlib/{ => tests}/testgrad.c (100%) rename wrlib/{ => tests}/testrot.c (100%) rename wrlib/{ => tests}/tile.xpm (100%) rename wrlib/{ => tests}/view.c (100%) diff --git a/ChangeLog b/ChangeLog index 40d6a6a5..524f1636 100644 --- a/ChangeLog +++ b/ChangeLog @@ -10,6 +10,7 @@ Changes since version 0.91.0: - Removed --with-appsdir option and replaced it with --with-gnustepdir. Also, default installation path (for non GNUstep users) is now $(prefix)/bin - fixed bug with infinite loop in some circumstances in fitText() in WINGs +- fixed to allow parallel builds on SMP systems using make -j Changes since version 0.90.0: diff --git a/FAQ b/FAQ index 1326b5b0..23b9dcdc 100644 --- a/FAQ +++ b/FAQ @@ -366,7 +366,7 @@ for your convenience. 2.8 Can I use WindowMaker with KDE or GNOME or CDE? --------------------------------------------------- -Contrary to a lot of people think, KDE is NOT a window manager. KDE is +Contrary to what a lot of people think, KDE is NOT a window manager. KDE is a suite of various applications that includes a custom window manager (kwm). The same is true for CDE. diff --git a/configure.ac b/configure.ac index fedaa806..3676e947 100644 --- a/configure.ac +++ b/configure.ac @@ -894,7 +894,8 @@ AC_OUTPUT(Makefile po/Makefile util/Makefile test/Makefile \ WINGs/Makefile WINGs/WINGs/Makefile WINGs/Documentation/Makefile \ WINGs/Examples/Makefile WINGs/Resources/Makefile WINGs/Tests/Makefile \ WINGs/Extras/Makefile WINGs/po/Makefile \ - wmlib/Makefile wrlib/Makefile src/Makefile src/wconfig.h \ + wmlib/Makefile wrlib/Makefile wrlib/tests/Makefile \ + src/Makefile src/wconfig.h \ doc/Makefile doc/sk/Makefile \ WindowMaker/Makefile WindowMaker/Backgrounds/Makefile \ WindowMaker/Defaults/Makefile WindowMaker/IconSets/Makefile \ diff --git a/wrlib/.cvsignore b/wrlib/.cvsignore index 8bcb3de5..c49caf07 100644 --- a/wrlib/.cvsignore +++ b/wrlib/.cvsignore @@ -1,5 +1,5 @@ Makefile Makefile.in *.lo *.la -view testgrad testdraw testrot get-wraster-flags +get-wraster-flags .libs *.pc .psrc .inslog2 tca.map tca.log pchdir *.rpt diff --git a/wrlib/Makefile.am b/wrlib/Makefile.am index b2b8d80f..f7a3428e 100644 --- a/wrlib/Makefile.am +++ b/wrlib/Makefile.am @@ -1,5 +1,7 @@ ## automake input file for wrlib +SUBDIRS = . tests + AUTOMAKE_OPTIONS = no-dependencies lib_LTLIBRARIES = libwraster.la @@ -8,9 +10,6 @@ libwraster_la_LDFLAGS = -version-info 4:0:1 bin_SCRIPTS = get-wraster-flags -noinst_PROGRAMS = testgrad testdraw view testrot - -EXTRA_DIST = test.png tile.xpm ballot_box.xpm include_HEADERS = wraster.h libwraster_la_SOURCES = \ @@ -57,26 +56,6 @@ x86_specific.o: x86_specific.c INCLUDES = $(DFLAGS) @HEADER_SEARCH_PATH@ -LIBLIST = $(top_builddir)/wrlib/libwraster.la - -view_SOURCES= view.c - -view_LDADD = $(LIBLIST) - -testgrad_SOURCES = testgrad.c - -testgrad_LDADD = $(LIBLIST) - -testrot_SOURCES = testrot.c - -testrot_LDADD = $(LIBLIST) - - -testdraw_SOURCES = testdraw.c - -testdraw_LDADD = $(LIBLIST) - - libwraster_la_LIBADD = @ALLOCA@ @LIBRARY_SEARCH_PATH@ @GFXLIBS@ @XLIBS@ -lm DISTCLEANFILES = wrlib.pc diff --git a/wrlib/.cvsignore b/wrlib/tests/.cvsignore similarity index 56% copy from wrlib/.cvsignore copy to wrlib/tests/.cvsignore index 8bcb3de5..6d7c549e 100644 --- a/wrlib/.cvsignore +++ b/wrlib/tests/.cvsignore @@ -1,5 +1,4 @@ Makefile Makefile.in -*.lo *.la -view testgrad testdraw testrot get-wraster-flags +view testgrad testdraw testrot .libs *.pc .psrc .inslog2 tca.map tca.log pchdir *.rpt diff --git a/wrlib/tests/Makefile.am b/wrlib/tests/Makefile.am new file mode 100644 index 00000000..abced962 --- /dev/null +++ b/wrlib/tests/Makefile.am @@ -0,0 +1,25 @@ +## automake input file for wrlib + +AUTOMAKE_OPTIONS = no-dependencies + +noinst_PROGRAMS = testdraw testgrad testrot view + +EXTRA_DIST = test.png tile.xpm ballot_box.xpm +include_HEADERS = $(top_builddir)/wrlib/wraster.h + +INCLUDES = $(DFLAGS) @HEADER_SEARCH_PATH@ + +LIBLIST = $(top_builddir)/wrlib/libwraster.la + +testdraw_SOURCES = testdraw.c +testdraw_LDADD = $(LIBLIST) + +testgrad_SOURCES = testgrad.c +testgrad_LDADD = $(LIBLIST) + +testrot_SOURCES = testrot.c +testrot_LDADD = $(LIBLIST) + +view_SOURCES= view.c +view_LDADD = $(LIBLIST) + diff --git a/wrlib/ballot_box.xpm b/wrlib/tests/ballot_box.xpm similarity index 100% rename from wrlib/ballot_box.xpm rename to wrlib/tests/ballot_box.xpm diff --git a/wrlib/test.png b/wrlib/tests/test.png similarity index 100% rename from wrlib/test.png rename to wrlib/tests/test.png diff --git a/wrlib/testdraw.c b/wrlib/tests/testdraw.c similarity index 100% rename from wrlib/testdraw.c rename to wrlib/tests/testdraw.c diff --git a/wrlib/testgrad.c b/wrlib/tests/testgrad.c similarity index 100% rename from wrlib/testgrad.c rename to wrlib/tests/testgrad.c diff --git a/wrlib/testrot.c b/wrlib/tests/testrot.c similarity index 100% rename from wrlib/testrot.c rename to wrlib/tests/testrot.c diff --git a/wrlib/tile.xpm b/wrlib/tests/tile.xpm similarity index 100% rename from wrlib/tile.xpm rename to wrlib/tests/tile.xpm diff --git a/wrlib/view.c b/wrlib/tests/view.c similarity index 100% rename from wrlib/view.c rename to wrlib/tests/view.c -- 2.11.4.GIT