aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Mackus <michaelmackus@gmail.com>2019-06-16 11:32:16 -0700
committerMichael Mackus <michaelmackus@gmail.com>2019-06-16 11:32:16 -0700
commitba56eac2ab8869c9720d4ee252fb8618a1f535f3 (patch)
tree6529655e38f149e52a5b651803020c699292d557
parent95dfa5e6560c1b19b52d8ec76ca725de1157f231 (diff)
downloadwterm-ba56eac2ab8869c9720d4ee252fb8618a1f535f3.zip
wterm-ba56eac2ab8869c9720d4ee252fb8618a1f535f3.tar.gz
wterm-ba56eac2ab8869c9720d4ee252fb8618a1f535f3.tar.bz2
Use WLD makefile
-rw-r--r--Makefile14
1 files changed, 6 insertions, 8 deletions
diff --git a/Makefile b/Makefile
index d644db3..2ce652f 100644
--- a/Makefile
+++ b/Makefile
@@ -6,27 +6,21 @@ WLDSRC=$(SRC)/wld
PKGS = fontconfig wayland-client wayland-cursor xkbcommon pixman-1 libdrm
-WTERM_SOURCES = $(wildcard $(WLDSRC)/*.c)
WTERM_SOURCES += $(wildcard $(SRC)/*.c)
-WTERM_HEADERS = $(wildcard $(WLDSRC)/*.h)
WTERM_HEADERS += $(wildcard $(SRC)/*.h)
ifeq ($(ENABLE_INTEL),1)
PKGS += libdrm_intel
-WTERM_SOURCES += $(wildcard $(WLDSRC)/intel/*.c)
-WTERM_HEADERS += $(wildcard $(WLDSRC)/intel/*.h)
CFLAGS += -DWITH_INTEL_DRM
endif
ifeq ($(ENABLE_NOUVEAU),1)
PKGS += libdrm_nouveau
-WTERM_SOURCES += $(wildcard $(WLDSRC)/nouveau/*.c)
-WTERM_HEADERS += $(wildcard $(WLDSRC)/nouveau/*.h)
CFLAGS += -DWITH_NOUVEAU_DRM
endif
CFLAGS += -std=gnu99 -Wall -g -DWITH_WAYLAND_DRM -DWITH_WAYLAND_SHM
CFLAGS += $(shell pkg-config --cflags $(PKGS)) -I include
-LDFLAGS = $(shell pkg-config --libs $(PKGS)) -lm -lutil
+LDFLAGS = $(shell pkg-config --libs $(PKGS)) -lm -lutil -L src/wld -lwld
WAYLAND_HEADERS = $(wildcard include/*.xml)
@@ -39,7 +33,7 @@ OBJECTS = $(SOURCES:.c=.o)
BIN_PREFIX = $(PREFIX)
SHARE_PREFIX = $(PREFIX)
-all: wterm
+all: wld wterm
include/config.h:
cp config.def.h include/config.h
@@ -55,8 +49,12 @@ $(OBJECTS): $(HDRS) include/config.h
wterm: $(OBJECTS)
$(CC) -o wterm $(OBJECTS) $(LDFLAGS)
+wld:
+ make -C src/wld
+
clean:
rm -f $(OBJECTS) $(HDRS) $(WAYLAND_SRC) include/config.h wterm
+ make -C src/wld clean
install-icons:
mkdir -p $(SHARE_PREFIX)/share/icons/hicolor/scalable/apps/