From 22a7b3c6f3a16e88c448d4165dd8701ee194cdca Mon Sep 17 00:00:00 2001 From: hendricks266 Date: Sat, 10 Jun 2017 06:21:29 +0000 Subject: [PATCH] Makefile: Move rules around to unbreak Linux builds. This may be a GNU Make bug. DONT_BUILD. git-svn-id: https://svn.eduke32.com/eduke32@6173 1a8010ca-5511-0410-912e-c29ae57300e0 --- GNUmakefile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/GNUmakefile b/GNUmakefile index 8e3d9c389..bbcd59237 100644 --- a/GNUmakefile +++ b/GNUmakefile @@ -922,6 +922,10 @@ $$($1_OBJ)/%.$$o: $$($1_SRC)/%.mm | $$($1_OBJ) $$(COMPILE_STATUS) $$(RECIPE_IF) $$(COMPILER_OBJCXX) $$($1_CFLAGS) -c $$< -o $$@ $$(RECIPE_RESULT_COMPILE) +$$($1_OBJ)/%.$$o: $$($1_OBJ)/%.c + $$(COMPILE_STATUS) + $$(RECIPE_IF) $$(COMPILER_C) $$($1_CFLAGS) -c $$< -o $$@ $$(RECIPE_RESULT_COMPILE) + ## Cosmetic stuff $$($1_OBJ)/%.$$o: $$($1_RSRC)/%.rc | $$($1_OBJ) @@ -932,10 +936,6 @@ $$($1_OBJ)/%.$$o: $$($1_RSRC)/%.c | $$($1_OBJ) $$(COMPILE_STATUS) $$(RECIPE_IF) $$(COMPILER_C) $$($1_CFLAGS) -c $$< -o $$@ $$(RECIPE_RESULT_COMPILE) -$$($1_OBJ)/%.$$o: $$($1_OBJ)/%.c - $$(COMPILE_STATUS) - $$(RECIPE_IF) $$(COMPILER_C) $$($1_CFLAGS) -c $$< -o $$@ $$(RECIPE_RESULT_COMPILE) - $$($1_OBJ)/%_banner.c: $$($1_RSRC)/%.bmp | $$($1_OBJ) echo "#include \"gtkpixdata_shim.h\"" > $$@ gdk-pixbuf-csource --extern --struct --raw --name=startbanner_pixdata $$^ | sed 's/load_inc//' >> $$@