From b0b77c699d6d13a4a69f2b01d3b1b6d0fb21e51d Mon Sep 17 00:00:00 2001 From: Doug Torrance Date: Tue, 7 Apr 2015 02:45:09 -0500 Subject: [PATCH] wmload: Replace deprecated Imakefile with Makefile. Update INSTALL to reflect changes. --- wmload/INSTALL | 9 ++++----- wmload/Imakefile | 17 ----------------- wmload/Makefile | 18 ++++++++++++++++++ 3 files changed, 22 insertions(+), 22 deletions(-) delete mode 100644 wmload/Imakefile create mode 100644 wmload/Makefile diff --git a/wmload/INSTALL b/wmload/INSTALL index 2217d98..ce0151f 100644 --- a/wmload/INSTALL +++ b/wmload/INSTALL @@ -1,8 +1,7 @@ -1. Check the Imakefile to see if all the LIBS are ok for your system. +1. Check the Makefile to see if all the LIBS are ok for your system. ALSO, check DESTDIR and BINDIR; as they are now, a `make install' will put the wmload binary in /usr/local/bin. -2. `xmkmf' -3. `make' -4. `make install' -5. Enjoy!!!! (;-) +2. `make' +3. `make install' +4. Enjoy!!!! (;-) diff --git a/wmload/Imakefile b/wmload/Imakefile deleted file mode 100644 index d91cbce..0000000 --- a/wmload/Imakefile +++ /dev/null @@ -1,17 +0,0 @@ -/* installation directory is the combination of $(DESTDIR) and $(BINDIR)*/ -DESTDIR = /usr/local -BINDIR = /bin - -XPMLIB = -L/usr/lib/X11 -lXpm -lm -DEPLIBS = $(DEPXLIB) - -LOCAL_LIBRARIES = $(XPMLIB) $(XLIB) - -LINTLIBS = $(LINTXLIB) - -EXTRA_DEFINES = -Debug /* CFLAGS = -Debug */ - -SRCS = wmload.c -OBJS = wmload.o - -ComplexProgramTarget(wmload) diff --git a/wmload/Makefile b/wmload/Makefile new file mode 100644 index 0000000..20c1547 --- /dev/null +++ b/wmload/Makefile @@ -0,0 +1,18 @@ +OBJS = wmload.o +LIBS = -lX11 -lXpm -lXext -lm +PREFIX = /usr/local +BINDIR = $(PREFIX)/bin +INSTALL = install + +%.o: %.c + $(CC) $(CPPFLAGS) $(CFLAGS) -c -o $@ $< + +wmload: $(OBJS) + $(CC) $(LDFLAGS) -o wmload $(OBJS) $(LIBS) + +clean: + rm -f $(OBJS) wmload + +install: wmload + $(INSTALL) -d $(DESTDIR)$(BINDIR) + $(INSTALL) wmload $(DESTDIR)$(BINDIR)