Import linux.patch

Patch largely based on cwmbuild.sh from http://tamentis.com/hacks/cwm/
written by Bertrand Janin, updated by Christian Neukirchen.
This commit is contained in:
Christian Neukirchen 2010-02-21 19:15:27 +01:00
parent 507480a695
commit 50aff37f50
3 changed files with 38 additions and 5 deletions

View File

@ -1,14 +1,23 @@
# $OpenBSD$
.include <bsd.xconf.mk>
#.include <bsd.xconf.mk>
PROG= cwm
BINDIR= /usr/bin
SRCS= calmwm.c screen.c xmalloc.c client.c menu.c \
search.c util.c xutil.c conf.c input.c xevents.c group.c \
kbfunc.c mousefunc.c font.c parse.y
CPPFLAGS+= -I${X11BASE}/include -I${X11BASE}/include/freetype2 -I${.CURDIR}
OBJS= calmwm.o screen.o xmalloc.o client.o menu.o \
search.o util.o xutil.o conf.o input.o xevents.o group.o \
kbfunc.o mousefunc.o font.o strlcpy.o strlcat.o y.tab.o \
strtonum.o fgetln.o
X11BASE= /usr
CPPFLAGS+= -I${X11BASE}/include -I${X11BASE}/include/freetype2 -I.
CFLAGS+= -Wall
@ -20,7 +29,26 @@ MAN= cwm.1 cwmrc.5
CLEANFILES= cwm.cat1 cwmrc.cat5
obj: _xenocara_obj
.include <bsd.prog.mk>
.include <bsd.xorg.mk>
all: $(PROG)
clean:
rm -rf $(OBJS) $(PROG) y.tab.c
y.tab.c: parse.y
byacc parse.y
$(PROG): $(OBJS) y.tab.o
$(CC) $(OBJS) ${LDADD} -o ${PROG}
$(OBJS): %.o: %.c
$(CC) -c $(CFLAGS) $(CPPFLAGS) $<
install: ${PROG}
install -m 755 cwm /usr/local/bin/
install -m 644 cwm.1 /usr/local/man/man1
install -m 644 cwmrc.5 /usr/local/man/man5
#.include <bsd.prog.mk>
#.include <bsd.xorg.mk>

View File

@ -21,6 +21,10 @@
#ifndef _CALMWM_H_
#define _CALMWM_H_
/* ugly stuff */
#define TAILQ_END(head) NULL
#define __dead
#include <X11/Xatom.h>
#include <X11/Xft/Xft.h>
#include <X11/Xlib.h>

View File

@ -29,6 +29,7 @@
#include <err.h>
#include <errno.h>
#include <signal.h>
#include <stdlib.h>
#include <string.h>
#include <stdio.h>