Mercurial > hg > batmud > maputils

changeset 2516:d75ce1235875

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Rename Makefile.gen to Makefile.common
author Matti Hamalainen <ccr@tnsp.org>
date Thu, 03 Aug 2023 08:59:10 +0300
parents d4f5f1000acb
children c16e21ccdc40
files Makefile Makefile.common Makefile.cross-mingw Makefile.gen
diffstat 4 files changed, 86 insertions(+), 86 deletions(-) [+]
line wrap: on
line diff
--- a/Makefile	Wed Aug 02 16:18:06 2023 +0300
+++ b/Makefile	Thu Aug 03 08:59:10 2023 +0300
@@ -43,4 +43,4 @@
 NOINST_TARGETS += $(ENDIANCHK_BIN) config.h
 THLIBS_DEP += config.h
 
-include Makefile.gen
+include Makefile.common
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/Makefile.common	Thu Aug 03 08:59:10 2023 +0300
@@ -0,0 +1,84 @@
+###
+### Include configuration
+###
+include config.mak
+include Makefile.paths
+
+
+###
+### Binaries and objects
+###
+LIBLOCFILE_OBJ=$(OBJPATH)liblocfile.o
+LIBMAPUTILS_OBJ=$(OBJPATH)libmaputils.o
+
+
+TARGETS += $(LIBMAPUTILS_OBJ) $(LIBLOCFILE_OBJ) \
+	$(COLORMAP_BIN) $(STITCHMAP_BIN) $(MKCITYMAP_BIN) \
+	$(DIFFMAP_BIN) $(PATCHMAP_BIN) $(MAP2PPM_BIN) \
+	$(MKLOC_BIN) $(COMBINE_BIN) $(MAPSTATS_BIN)
+
+ifneq ($(BUILD_MAPS),no)
+TARGETS += $(addprefix $(MISC_MAPS_PATH),$(addsuffix .html,$(MISC_MAPS)))
+endif
+
+
+ifeq ($(HAVE_LIBWEBSOCKETS),yes)
+TARGETS += $(MAPSEARCH_BIN)
+MAPSEARCH_CFLAGS += -D_POSIX_C_SOURCE=200112 $(LIBWEBSOCKETS_CFLAGS)
+MAPSEARCH_LDFLAGS += $(LIBWEBSOCKETS_LDFLAGS) -lm
+endif
+
+ifeq ($(HAVE_LIBPNG),yes)
+MAP2PPM_CFLAGS += -DHAVE_LIBPNG=1 $(LIBPNG_CFLAGS) $(ZLIB_CFLAGS)
+MAP2PPM_LDFLAGS += $(LIBPNG_LDFLAGS) $(ZLIB_LDFLAGS) -lm
+endif
+
+
+###
+### Include th-libs build system bits
+###
+THLIBS_OBJ = th_util.o th_string.o th_args.o th_datastruct.o
+
+include $(THLIBS)/Makefile.inc
+
+
+###
+### Binary target rules
+###
+$(OBJPATH)%.o: src/%.c $(THLIBS_A)
+	$(call COMPILE_C_OBJ, -I$(THLIBS))
+
+$(BINPATH)%$(BINEXT): $(OBJPATH)%.o $(LIBMAPUTILS_OBJ) $(LIBLOCFILE_OBJ) $(THLIBS_A) $(THLIBS_DEP)
+	$(call LINK_C_BIN,)
+
+
+$(OBJPATH)map2ppm.o: src/map2ppm.c $(THLIBS_A)
+	$(call COMPILE_C_OBJ, $(MAP2PPM_CFLAGS))
+
+$(MAP2PPM_BIN): $(OBJPATH)map2ppm.o $(LIBMAPUTILS_OBJ) $(THLIBS_A) $(THLIBS_DEP)
+	$(call LINK_C_BIN, $(MAP2PPM_LDFLAGS) $(THLIBS_A))
+
+
+$(OBJPATH)mapsearch.o: src/mapsearch.c $(THLIBS_A)
+	$(call COMPILE_C_OBJ, $(MAPSEARCH_CFLAGS))
+
+$(MAPSEARCH_BIN): $(OBJPATH)mapsearch.o $(LIBMAPUTILS_OBJ) $(LIBLOCFILE_OBJ) $(THLIBS_A) $(THLIBS_DEP)
+	$(call LINK_C_BIN, $(MAPSEARCH_LDFLAGS) $(THLIBS_A))
+
+
+###
+### Misc map targets
+###
+$(MISC_MAPS_PATH)%.html: $(MISC_MAPS_PATH)%.map $(MISC_MAPS_PATH)%.loc $(MISC_MAPS_PATH)%.desc $(MKCITYMAP_BIN) src/tooltip.js $(MISC_MAPS_PATH)misc.html
+	@$(call DO_CMD,MKCITYMAP,$@,$(MKCITYMAP_BIN) $(MKCITYMAP_OPTS) -h $(MISC_MAPS_PATH)misc.html -t "`cat $(patsubst %.map,%.desc,$<)`" $< $(patsubst %.map,%.loc,$<) `cat $(patsubst %.map,%.opts,$<)` -o "$@")
+
+
+###
+### Special targets
+###
+upload: src/tooltip.js src/util.js $(MISC_MAPS_PATH)misc.css \
+	$(addprefix $(MISC_MAPS_PATH),$(addsuffix .html,$(MISC_MAPS))) \
+	$(addprefix $(MISC_MAPS_PATH),$(addsuffix .map,$(MISC_MAPS))) \
+	$(addprefix $(MISC_MAPS_PATH),$(addsuffix .loc,$(MISC_MAPS)))
+	$(RSCP) $? $(UPLOAD_URL)
+	@touch $@
--- a/Makefile.cross-mingw	Wed Aug 02 16:18:06 2023 +0300
+++ b/Makefile.cross-mingw	Thu Aug 03 08:59:10 2023 +0300
@@ -56,4 +56,4 @@
 #NOINST_TARGETS += $(ENDIANCHK_BIN) config.h
 #THLIBS_DEP += config.h
 
-include Makefile.gen
+include Makefile.common
--- a/Makefile.gen	Wed Aug 02 16:18:06 2023 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,84 +0,0 @@
-###
-### Include configuration
-###
-include config.mak
-include Makefile.paths
-
-
-###
-### Binaries and objects
-###
-LIBLOCFILE_OBJ=$(OBJPATH)liblocfile.o
-LIBMAPUTILS_OBJ=$(OBJPATH)libmaputils.o
-
-
-TARGETS += $(LIBMAPUTILS_OBJ) $(LIBLOCFILE_OBJ) \
-	$(COLORMAP_BIN) $(STITCHMAP_BIN) $(MKCITYMAP_BIN) \
-	$(DIFFMAP_BIN) $(PATCHMAP_BIN) $(MAP2PPM_BIN) \
-	$(MKLOC_BIN) $(COMBINE_BIN) $(MAPSTATS_BIN)
-
-ifneq ($(BUILD_MAPS),no)
-TARGETS += $(addprefix $(MISC_MAPS_PATH),$(addsuffix .html,$(MISC_MAPS)))
-endif
-
-
-ifeq ($(HAVE_LIBWEBSOCKETS),yes)
-TARGETS += $(MAPSEARCH_BIN)
-MAPSEARCH_CFLAGS += -D_POSIX_C_SOURCE=200112 $(LIBWEBSOCKETS_CFLAGS)
-MAPSEARCH_LDFLAGS += $(LIBWEBSOCKETS_LDFLAGS) -lm
-endif
-
-ifeq ($(HAVE_LIBPNG),yes)
-MAP2PPM_CFLAGS += -DHAVE_LIBPNG=1 $(LIBPNG_CFLAGS) $(ZLIB_CFLAGS)
-MAP2PPM_LDFLAGS += $(LIBPNG_LDFLAGS) $(ZLIB_LDFLAGS) -lm
-endif
-
-
-###
-### Include th-libs build system bits
-###
-THLIBS_OBJ = th_util.o th_string.o th_args.o th_datastruct.o
-
-include $(THLIBS)/Makefile.inc
-
-
-###
-### Binary target rules
-###
-$(OBJPATH)%.o: src/%.c $(THLIBS_A)
-	$(call COMPILE_C_OBJ, -I$(THLIBS))
-
-$(BINPATH)%$(BINEXT): $(OBJPATH)%.o $(LIBMAPUTILS_OBJ) $(LIBLOCFILE_OBJ) $(THLIBS_A) $(THLIBS_DEP)
-	$(call LINK_C_BIN,)
-
-
-$(OBJPATH)map2ppm.o: src/map2ppm.c $(THLIBS_A)
-	$(call COMPILE_C_OBJ, $(MAP2PPM_CFLAGS))
-
-$(MAP2PPM_BIN): $(OBJPATH)map2ppm.o $(LIBMAPUTILS_OBJ) $(THLIBS_A) $(THLIBS_DEP)
-	$(call LINK_C_BIN, $(MAP2PPM_LDFLAGS) $(THLIBS_A))
-
-
-$(OBJPATH)mapsearch.o: src/mapsearch.c $(THLIBS_A)
-	$(call COMPILE_C_OBJ, $(MAPSEARCH_CFLAGS))
-
-$(MAPSEARCH_BIN): $(OBJPATH)mapsearch.o $(LIBMAPUTILS_OBJ) $(LIBLOCFILE_OBJ) $(THLIBS_A) $(THLIBS_DEP)
-	$(call LINK_C_BIN, $(MAPSEARCH_LDFLAGS) $(THLIBS_A))
-
-
-###
-### Misc map targets
-###
-$(MISC_MAPS_PATH)%.html: $(MISC_MAPS_PATH)%.map $(MISC_MAPS_PATH)%.loc $(MISC_MAPS_PATH)%.desc $(MKCITYMAP_BIN) src/tooltip.js $(MISC_MAPS_PATH)misc.html
-	@$(call DO_CMD,MKCITYMAP,$@,$(MKCITYMAP_BIN) $(MKCITYMAP_OPTS) -h $(MISC_MAPS_PATH)misc.html -t "`cat $(patsubst %.map,%.desc,$<)`" $< $(patsubst %.map,%.loc,$<) `cat $(patsubst %.map,%.opts,$<)` -o "$@")
-
-
-###
-### Special targets
-###
-upload: src/tooltip.js src/util.js $(MISC_MAPS_PATH)misc.css \
-	$(addprefix $(MISC_MAPS_PATH),$(addsuffix .html,$(MISC_MAPS))) \
-	$(addprefix $(MISC_MAPS_PATH),$(addsuffix .map,$(MISC_MAPS))) \
-	$(addprefix $(MISC_MAPS_PATH),$(addsuffix .loc,$(MISC_MAPS)))
-	$(RSCP) $? $(UPLOAD_URL)
-	@touch $@