From 3021fd4751ec23b5252e10308480179204e60ef7 Mon Sep 17 00:00:00 2001 From: Tomasz Kramkowski Date: Wed, 28 Mar 2018 13:33:58 +0100 Subject: Move assets*.o from Makefile to assets.mk --- Makefile | 9 +++++---- assets.mk | 3 ++- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/Makefile b/Makefile index 737ef79..8681e8b 100644 --- a/Makefile +++ b/Makefile @@ -14,9 +14,13 @@ CFLAGS += $(shell $(PKG_CONFIG) --cflags $(LIBS)) -std=c11 -MMD -MP LDFLAGS += -Wl,--as-needed LDLIBS += $(shell $(PKG_CONFIG) --libs $(LIBS)) -lm -OBJ := gltest.o loadgl.o eprintf.o glprog.o assets.o assets_data.o +OBJ := gltest.o loadgl.o eprintf.o glprog.o all: $(PROG) + +include assets.mk +include $(EPRINTF_PATH)/module.mk + $(PROG): $(OBJ) gltest.o: assets.h loadgl.o gltest.o glprog.o: loadgl.h @@ -24,9 +28,6 @@ loadgl.c loadgl.h: loadgl.%: loadgl.m4 loadgl.%.in m4 $^ >$@ CLEAN += loadgl.c loadgl.h -include assets.mk - -include $(EPRINTF_PATH)/module.mk deplinks: $(EPRINTF_FILES) DEP := $(OBJ:.o=.d) diff --git a/assets.mk b/assets.mk index 27c502f..cdb2c8a 100644 --- a/assets.mk +++ b/assets.mk @@ -1,4 +1,6 @@ ASSETS := vert.glsl frag.glsl +OBJ += assets.o assets_data.o +CLEAN += assets.bie assets.idx assets.o: assets.h assets.h assets.c: assets.idx @@ -6,4 +8,3 @@ assets.bie assets.idx: $(ASSETS) bie assets.bie assets.idx $^ assets_data.o: assets.bie $(LD) -r -b binary $(OUTPUT_OPTION) $< -CLEAN += assets.bie assets.idx -- cgit v1.2.3-54-g00ecf