diff options
| author | Tomasz Kramkowski <tk@the-tk.com> | 2018-03-28 13:33:58 +0100 |
|---|---|---|
| committer | Tomasz Kramkowski <tk@the-tk.com> | 2018-03-28 13:47:43 +0100 |
| commit | 3021fd4751ec23b5252e10308480179204e60ef7 (patch) | |
| tree | 606d0d92a39ea7f0f005cc4fd31925a818b947df | |
| parent | 768feb8bf10807142ff1f21d29f7492509362a18 (diff) | |
| download | faqe-3021fd4751ec23b5252e10308480179204e60ef7.tar.gz faqe-3021fd4751ec23b5252e10308480179204e60ef7.tar.xz faqe-3021fd4751ec23b5252e10308480179204e60ef7.zip | |
Move assets*.o from Makefile to assets.mk
| -rw-r--r-- | Makefile | 9 | ||||
| -rw-r--r-- | assets.mk | 3 |
2 files changed, 7 insertions, 5 deletions
@@ -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) @@ -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 |