Skip to content

Commit 3280151

Browse files
committed
major rewrite 2 electric boogaloo: incomplete edition
1 parent b11f85a commit 3280151

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

59 files changed

+1707
-2799
lines changed

Diff for: Makefile

+11-6
Original file line numberDiff line numberDiff line change
@@ -14,32 +14,37 @@ BUILDPREFIX = build
1414

1515
TARGET = custard
1616
SRC := $(wildcard $(SRCPREFIX)/*.c)
17+
SUBDIRS := $(wildcard $(SRCPREFIX)/*/*.c)
1718
OBJ := $(subst $(SRCPREFIX),$(BUILDPREFIX),$(SRC:.c=.o))
19+
OBJ += $(subst $(SRCPREFIX),$(BUILDPREFIX),$(SUBDIRS:.c=.o))
1820
DEPS = $(OBJ:.o=.d)
1921
VPATH = $(SRCPREFIX)
22+
MKDIR = mkdir
2023

2124
.PHONY: all clean install uninstall
2225

23-
all: $(TARGET)
26+
all: prepare $(TARGET)
2427

2528
$(TARGET): $(OBJ)
26-
@ #printf "[34mLD[0m :: $@\n"
29+
@ #printf "[34mLD[0m :: $@ $(OBJ)\n"
2730
$(LD) -o $(BUILDPREFIX)/$@ $(OBJ) $(LDFLAGS)
2831

2932
$(BUILDPREFIX)/%.o: $(SRCPREFIX)/%.c
30-
@[ -d build ] || mkdir -p $(BUILDPREFIX)
3133
@ #printf "CC :: $@\n"
3234
$(CC) -o $@ $(CFLAGS) -c $<
3335

36+
prepare:
37+
@[ -d $(BUILDPREFIX) ] || mkdir -p $(BUILDPREFIX)
38+
@[ -d $(BUILDPREFIX)/wm ] || mkdir -p $(BUILDPREFIX)/wm
39+
@[ -d $(BUILDPREFIX)/xcb ] || mkdir -p $(BUILDPREFIX)/xcb
40+
@[ -d $(BUILDPREFIX)/ipc ] || mkdir -p $(BUILDPREFIX)/ipc
41+
3442
clean:
3543
$(RM) -r $(BUILDPREFIX)
3644

3745
install: all
3846
install -Dm755 "$(BUILDPREFIX)/$(TARGET)" "$(DESTDIR)$(BINPREFIX)/$(TARGET)"
39-
# install -Dm755 "contrib/custardctl.py" "$(DESTDIR)$(BINPREFIX)/custardctl"
4047
# install -Dm644 "$(SRCPREFIX)/man/custard.man" "$(DESTDIR)$(MANPREFIX)/man1/custard.1"
4148

4249
uninstall:
4350
$(RM) "$(DESTDIR)$(BINPREFIX)/$(TARGET)"
44-
# $(RM) "$(DESTDIR)$(BINPREFIX)/custardctl"
45-
# $(RM) "$(DESTDIR)$(MANPREFIX)/man1/custardctl.1"

Diff for: src/configuration.c

-72
This file was deleted.

Diff for: src/configuration.h

-17
This file was deleted.

Diff for: src/controller.c

-58
This file was deleted.

Diff for: src/controller.h

-13
This file was deleted.

0 commit comments

Comments
 (0)