Remove symlink from osmpbf to src, use osmpbf directly

.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

build.sh

@@ -1,2 +1,2 @@
-protoc --java_out=generated.java src/osmformat.proto
+protoc --java_out=generated.java osmpbf/osmformat.proto
-protoc --java_out=generated.java src/fileformat.proto
+protoc --java_out=generated.java osmpbf/fileformat.proto

osmpbf

@@ -1 +0,0 @@
-src

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>

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