From b0fb22bdd6d6d53430a4e168d7208d5feaf18e55 Mon Sep 17 00:00:00 2001 From: Andri Yngvason Date: Sat, 14 Sep 2019 16:07:34 +0000 Subject: [PATCH] Rename inc -> include for sake of convention --- common.mk | 2 +- examples/Makefile | 4 ++-- {inc => include}/likely.h | 0 {inc => include}/neatvnc.h | 0 {inc => include}/pixels.h | 0 {inc => include}/rfb-proto.h | 0 {inc => include}/type-macros.h | 0 {inc => include}/util.h | 0 {inc => include}/vec.h | 0 {inc => include}/zrle.h | 0 10 files changed, 3 insertions(+), 3 deletions(-) rename {inc => include}/likely.h (100%) rename {inc => include}/neatvnc.h (100%) rename {inc => include}/pixels.h (100%) rename {inc => include}/rfb-proto.h (100%) rename {inc => include}/type-macros.h (100%) rename {inc => include}/util.h (100%) rename {inc => include}/vec.h (100%) rename {inc => include}/zrle.h (100%) diff --git a/common.mk b/common.mk index b0dea4a..d11e515 100644 --- a/common.mk +++ b/common.mk @@ -27,7 +27,7 @@ endif CFLAGS ?= -g -O3 $(ARCH_CFLAGS) -flto -DNDEBUG LDFLAGS ?= -flto -CFLAGS += -std=gnu11 -D_GNU_SOURCE -Iinc +CFLAGS += -std=gnu11 -D_GNU_SOURCE -Iinclude CC_OBJ = $(CC) -c $(CFLAGS) $< -o $@ -MMD -MP -MF $(@:.o=.deps) LINK_EXE = $(CC) $^ $(LDFLAGS) -o $@ diff --git a/examples/Makefile b/examples/Makefile index 6fd3bc4..49f42d2 100644 --- a/examples/Makefile +++ b/examples/Makefile @@ -17,8 +17,8 @@ $(BUILD_DIR)/png-server: $(BUILD_DIR)/png-server.o $(BUILD_DIR)/pngfb.o $(BUILD_DIR)/draw: $(BUILD_DIR)/draw.o ; $(LINK_EXE) -$(BUILD_DIR)/%.o: %.c | $(BUILD_DIR) ; $(CC_OBJ) -I../inc +$(BUILD_DIR)/%.o: %.c | $(BUILD_DIR) ; $(CC_OBJ) -I../include $(BUILD_DIR)/pngfb.o: ../src/pngfb.c | $(BUILD_DIR) - $(CC_OBJ) -I../inc + $(CC_OBJ) -I../include diff --git a/inc/likely.h b/include/likely.h similarity index 100% rename from inc/likely.h rename to include/likely.h diff --git a/inc/neatvnc.h b/include/neatvnc.h similarity index 100% rename from inc/neatvnc.h rename to include/neatvnc.h diff --git a/inc/pixels.h b/include/pixels.h similarity index 100% rename from inc/pixels.h rename to include/pixels.h diff --git a/inc/rfb-proto.h b/include/rfb-proto.h similarity index 100% rename from inc/rfb-proto.h rename to include/rfb-proto.h diff --git a/inc/type-macros.h b/include/type-macros.h similarity index 100% rename from inc/type-macros.h rename to include/type-macros.h diff --git a/inc/util.h b/include/util.h similarity index 100% rename from inc/util.h rename to include/util.h diff --git a/inc/vec.h b/include/vec.h similarity index 100% rename from inc/vec.h rename to include/vec.h diff --git a/inc/zrle.h b/include/zrle.h similarity index 100% rename from inc/zrle.h rename to include/zrle.h