From 802d4603b2e13a6d1dce58e5ca6b5ab457f997f6 Mon Sep 17 00:00:00 2001
From: Jochen Topf <jochen@topf.org>
Date: Mon, 11 Mar 2024 09:09:12 +0100
Subject: [PATCH] Remove Makefiles (have been deprecated a while)

---
 .github/workflows/c.yml | 11 -----------
 README.md               |  5 +----
 osmpbf/Makefile         | 44 -----------------------------------------
 tools/Makefile          | 23 ---------------------
 4 files changed, 1 insertion(+), 82 deletions(-)
 delete mode 100644 osmpbf/Makefile
 delete mode 100644 tools/Makefile

diff --git a/.github/workflows/c.yml b/.github/workflows/c.yml
index b06cff8..2037183 100644
--- a/.github/workflows/c.yml
+++ b/.github/workflows/c.yml
@@ -52,17 +52,6 @@ jobs:
       - uses: ./.github/actions/install-ubuntu
       - uses: ./.github/actions/build
 
-  ubuntu22-make:
-    runs-on: ubuntu-22.04
-    env:
-      CC: gcc
-      CXX: g++
-      CXXFLAGS: -Werror -Wall -pedantic
-    steps:
-      - uses: actions/checkout@v4
-      - uses: ./.github/actions/install-ubuntu
-      - run: make -C osmpbf
-
   macos:
     runs-on: macos-latest
     env:
diff --git a/README.md b/README.md
index 36d474f..6ce55f5 100644
--- a/README.md
+++ b/README.md
@@ -3,7 +3,7 @@
 
 https://github.com/openstreetmap/OSM-binary
 
-Osmpbf is a Java/C library to read and write OpenStreetMap PBF files.
+Osmpbf is a Java/C++ library to read and write OpenStreetMap PBF files.
 PBF (Protocol buffer Binary Format) is a binary file format for OpenStreetMap
 data that uses Google Protocol Buffers as low-level storage.
 
@@ -55,9 +55,6 @@ This build is also used for Debian packaging.
 
 ## C++ Version
 
-(Earlier versions used Makefiles for building. Please switch to the CMake-based
-build, the Makefiles are deprecated and will be removed in a future version.)
-
 To compile:
 
 ```sh
diff --git a/osmpbf/Makefile b/osmpbf/Makefile
deleted file mode 100644
index 1fdac7b..0000000
--- a/osmpbf/Makefile
+++ /dev/null
@@ -1,44 +0,0 @@
-
-# these default settings can be overridden by setting environment variables
-PREFIX   ?= /usr/local
-LIBDIR   ?= $(PREFIX)/lib
-CXX      ?= g++
-CXXFLAGS ?= -O3
-AR       ?= ar
-PROTOC   ?= protoc
-SONAME   ?= libosmpbf.so.1
-VERSION  ?= 1.5.0
-
-CXXFLAGS += -Wall -Wextra -pedantic -Wredundant-decls -Wdisabled-optimization -Wctor-dtor-privacy -Wnon-virtual-dtor -Woverloaded-virtual -Wsign-promo -Wno-long-long
-
-.PHONY: clean install
-
-all: libosmpbf.a libosmpbf.so ../include/osmpbf/fileformat.pb.h ../include/osmpbf/osmformat.pb.h
-
-libosmpbf.a: fileformat.pb.o osmformat.pb.o
-	$(AR) -cr $@ fileformat.pb.o osmformat.pb.o
-
-libosmpbf.so: fileformat.pb.o osmformat.pb.o
-	$(CXX) $(CPPFLAGS) $(LDFLAGS) -shared -Wl,-soname,$(SONAME) -o $@ fileformat.pb.o osmformat.pb.o
-
-%.pb.o: %.pb.cc
-	$(CXX) $(CPPFLAGS) $(CXXFLAGS) -fPIC -c -o $@ $<
-
-%.pb.cc ../include/osmpbf/%.pb.h: %.proto
-	$(PROTOC) --proto_path=. --cpp_out=. $<
-	cp -v $(subst .proto,.pb.h,$<) ../include/osmpbf/
-
-install:
-	install -m 755 -d $(DESTDIR)$(LIBDIR)
-	install -m 644 libosmpbf.a $(DESTDIR)$(LIBDIR)
-	install -m 755 libosmpbf.so $(DESTDIR)$(LIBDIR)/libosmpbf.so.$(VERSION)
-	ln -s libosmpbf.so.$(VERSION) $(DESTDIR)$(LIBDIR)/$(SONAME)
-	ln -s libosmpbf.so.$(VERSION) $(DESTDIR)$(LIBDIR)/libosmpbf.so
-	install -m 755 -d $(DESTDIR)$(PREFIX)/include/osmpbf
-	install -m 644 ../include/osmpbf/osmpbf.h $(DESTDIR)$(PREFIX)/include/osmpbf
-	install -m 644 ../include/osmpbf/fileformat.pb.h $(DESTDIR)$(PREFIX)/include/osmpbf
-	install -m 644 ../include/osmpbf/osmformat.pb.h $(DESTDIR)$(PREFIX)/include/osmpbf
-
-clean:
-	rm -f *.pb.h *.pb.cc *.pb.o libosmpbf.a
-
diff --git a/tools/Makefile b/tools/Makefile
deleted file mode 100644
index c16bcb0..0000000
--- a/tools/Makefile
+++ /dev/null
@@ -1,23 +0,0 @@
-
-# these default settings can be overridden by setting environment variables
-PREFIX   ?= /usr/local
-CXX      ?= g++
-CXXFLAGS ?= -g
-
-CXXFLAGS += -I../include -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 -Wall -Wextra -pedantic -Wredundant-decls -Wdisabled-optimization -Wctor-dtor-privacy -Wnon-virtual-dtor -Woverloaded-virtual -Wsign-promo -Wno-long-long
-LDFLAGS  += -L../osmpbf -pthread -lz -lprotobuf -losmpbf
-
-.PHONY: clean install
-
-all: osmpbf-outline
-
-osmpbf-outline: osmpbf-outline.cpp
-	$(CXX) $(CPPFLAGS) $(CXXFLAGS) -o $@ $< $(LDFLAGS)
-
-install:
-	install -m 755 -d $(DESTDIR)$(PREFIX)/bin
-	install -m 755 -s osmpbf-outline $(DESTDIR)$(PREFIX)/bin
-
-clean:
-	rm -f osmpbf-outline
-