Move stuff to include/ and src/

next
Michael Stapelberg 2009-02-13 19:09:25 +01:00
parent 7c0317c8a3
commit 82dd64ff24
21 changed files with 15 additions and 13 deletions

View File

@ -4,9 +4,8 @@ CFLAGS += -Wall
# Extended debugging flags, macros shall be available in gcc # Extended debugging flags, macros shall be available in gcc
CFLAGS += -gdwarf-2 CFLAGS += -gdwarf-2
CFLAGS += -g3 CFLAGS += -g3
#CFLAGS += -I/usr/include/xcb CFLAGS += -Iinclude
CFLAGS += -I/usr/local/include/ CFLAGS += -I/usr/local/include/
#CFLAGS += -I/usr/local/include/xcb
CFLAGS += -I/usr/pkg/include CFLAGS += -I/usr/pkg/include
LDFLAGS += -lxcb-wm LDFLAGS += -lxcb-wm
@ -18,13 +17,16 @@ ifeq ($(UNAME),NetBSD)
LDFLAGS += -Wl,-rpath,/usr/local/lib -Wl,-rpath,/usr/pkg/lib LDFLAGS += -Wl,-rpath,/usr/local/lib -Wl,-rpath,/usr/pkg/lib
endif endif
FILES=$(patsubst %.c,%.o,$(wildcard *.c)) FILES=$(patsubst %.c,%.o,$(wildcard src/*.c))
%.o: %.c %.h data.h src/%.o: src/%.c include/%.h include/data.h
$(CC) $(CFLAGS) -c -o $@ $< $(CC) $(CFLAGS) -c -o $@ $<
all: ${FILES} all: ${FILES}
$(CC) -o mainx ${FILES} $(LDFLAGS) $(CC) -o i3 ${FILES} $(LDFLAGS)
clean: clean:
rm -f *.o rm -f src/*.o
distclean: clean
rm -f i3

View File

View File

@ -36,7 +36,7 @@
#define _SYS_QUEUE_H_ #define _SYS_QUEUE_H_
/* /*
* This file defines five types of data structures: singly-linked lists, * This file defines five types of data structures: singly-linked lists,
* lists, simple queues, tail queues, and circular queues. * lists, simple queues, tail queues, and circular queues.
* *
* *
@ -95,15 +95,15 @@
struct name { \ struct name { \
struct type *slh_first; /* first element */ \ struct type *slh_first; /* first element */ \
} }
#define SLIST_HEAD_INITIALIZER(head) \ #define SLIST_HEAD_INITIALIZER(head) \
{ NULL } { NULL }
#define SLIST_ENTRY(type) \ #define SLIST_ENTRY(type) \
struct { \ struct { \
struct type *sle_next; /* next element */ \ struct type *sle_next; /* next element */ \
} }
/* /*
* Singly-linked List access methods. * Singly-linked List access methods.
*/ */
@ -318,8 +318,8 @@ struct { \
struct type **tqe_prev; /* address of previous next element */ \ struct type **tqe_prev; /* address of previous next element */ \
} }
/* /*
* tail queue access methods * tail queue access methods
*/ */
#define TAILQ_FIRST(head) ((head)->tqh_first) #define TAILQ_FIRST(head) ((head)->tqh_first)
#define TAILQ_END(head) NULL #define TAILQ_END(head) NULL
@ -426,7 +426,7 @@ struct { \
} }
/* /*
* Circular queue access methods * Circular queue access methods
*/ */
#define CIRCLEQ_FIRST(head) ((head)->cqh_first) #define CIRCLEQ_FIRST(head) ((head)->cqh_first)
#define CIRCLEQ_LAST(head) ((head)->cqh_last) #define CIRCLEQ_LAST(head) ((head)->cqh_last)

View File

View File

View File