From 37adab91e5fe633fcf4bc187b63d3e5550a7a248 Mon Sep 17 00:00:00 2001
From: Jochen Topf <jochen@topf.org>
Date: Fri, 27 May 2022 12:36:32 +0200
Subject: [PATCH] Remove symlink from osmpbf to src, use osmpbf directly

---
 .github/workflows/c.yml          | 2 +-
 build.sh                         | 4 ++--
 osmpbf                           | 1 -
 {src => osmpbf}/CMakeLists.txt   | 0
 {src => osmpbf}/LICENSE          | 0
 {src => osmpbf}/Makefile         | 0
 {src => osmpbf}/fileformat.proto | 0
 {src => osmpbf}/osmformat.proto  | 0
 pom.xml                          | 2 +-
 tools/Makefile                   | 2 +-
 10 files changed, 5 insertions(+), 6 deletions(-)
 delete mode 120000 osmpbf
 rename {src => osmpbf}/CMakeLists.txt (100%)
 rename {src => osmpbf}/LICENSE (100%)
 rename {src => osmpbf}/Makefile (100%)
 rename {src => osmpbf}/fileformat.proto (100%)
 rename {src => osmpbf}/osmformat.proto (100%)

diff --git a/.github/workflows/c.yml b/.github/workflows/c.yml
index 2b7e4cc..b3f83f9 100644
--- a/.github/workflows/c.yml
+++ b/.github/workflows/c.yml
@@ -61,7 +61,7 @@ jobs:
     steps:
       - uses: actions/checkout@v2
       - uses: ./.github/actions/install-ubuntu
-      - run: make -C src
+      - run: make -C osmpbf
 
   macos:
     runs-on: macos-latest
diff --git a/build.sh b/build.sh
index 06bfa27..107eaa3 100644
--- a/build.sh
+++ b/build.sh
@@ -1,2 +1,2 @@
-protoc --java_out=generated.java src/osmformat.proto
-protoc --java_out=generated.java src/fileformat.proto
+protoc --java_out=generated.java osmpbf/osmformat.proto
+protoc --java_out=generated.java osmpbf/fileformat.proto
diff --git a/osmpbf b/osmpbf
deleted file mode 120000
index e831038..0000000
--- a/osmpbf
+++ /dev/null
@@ -1 +0,0 @@
-src
\ No newline at end of file
diff --git a/src/CMakeLists.txt b/osmpbf/CMakeLists.txt
similarity index 100%
rename from src/CMakeLists.txt
rename to osmpbf/CMakeLists.txt
diff --git a/src/LICENSE b/osmpbf/LICENSE
similarity index 100%
rename from src/LICENSE
rename to osmpbf/LICENSE
diff --git a/src/Makefile b/osmpbf/Makefile
similarity index 100%
rename from src/Makefile
rename to osmpbf/Makefile
diff --git a/src/fileformat.proto b/osmpbf/fileformat.proto
similarity index 100%
rename from src/fileformat.proto
rename to osmpbf/fileformat.proto
diff --git a/src/osmformat.proto b/osmpbf/osmformat.proto
similarity index 100%
rename from src/osmformat.proto
rename to osmpbf/osmformat.proto
diff --git a/pom.xml b/pom.xml
index 4c64245..941113a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -70,7 +70,7 @@
             </goals>
             <phase>generate-sources</phase>
             <configuration>
-              <protoSourceRoot>${basedir}/src</protoSourceRoot>
+              <protoSourceRoot>${basedir}/osmpbf</protoSourceRoot>
               <includes>
                 <param>**/*.proto</param>
               </includes>
diff --git a/tools/Makefile b/tools/Makefile
index daa3a8a..c16bcb0 100644
--- a/tools/Makefile
+++ b/tools/Makefile
@@ -5,7 +5,7 @@ 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../src -pthread -lz -lprotobuf -losmpbf
+LDFLAGS  += -L../osmpbf -pthread -lz -lprotobuf -losmpbf
 
 .PHONY: clean install