misc: merge rem into re (#184)

* merge rem into re

* ci: fix azure

* test

* fedora: try to revert

* ci: revert run-on-arch

* remove test

.github/workflows/all.yml

@@ -30,19 +30,13 @@ jobs:
         repo: https://github.com/baresip/re
         secret: ${{ secrets.GITHUB_TOKEN }}
 
-    - uses: sreimers/[email protected]
-      with:
-        name: rem
-        repo: https://github.com/baresip/rem
-        secret: ${{ secrets.GITHUB_TOKEN }}
-
-    - name: make re/rem
+    - name: make re
       run: |
-        for p in re rem; do
+        for p in re; do
           cmake -S $p -B $p/build
           cmake --build $p/build -j
         done
-        for p in re rem; do
+        for p in re; do
           mv $p ../.
         done
 

.github/workflows/build.yml

@@ -55,20 +55,14 @@ jobs:
         repo: https://github.com/baresip/re
         secret: ${{ secrets.GITHUB_TOKEN }}
 
-    - uses: sreimers/[email protected]
-      with:
-        name: rem
-        repo: https://github.com/baresip/rem
-        secret: ${{ secrets.GITHUB_TOKEN }}
-
-    - name: make re/rem
+    - name: make re
       shell: bash
       run: |
-        for p in re rem; do
+        for p in re; do
           cmake -S $p -B $p/build
           cmake --build $p/build -j
         done
-        for p in re rem; do
+        for p in re; do
           mv $p ../.
         done
 

.github/workflows/fedora.yml

@@ -67,13 +67,13 @@ jobs:
         ${{ matrix.compiler }} - --version
         /sbin/ifconfig
 
-    - name: make re/rem
+    - name: make re
       run: |
-        for p in re rem; do
+        for p in re; do
           cmake -S $p -B $p/build
           cmake --build $p/build -j
         done
-        for p in re rem; do
+        for p in re; do
           mv $p ../.
         done
 

.github/workflows/run-on-arch.yml

@@ -95,11 +95,11 @@ jobs:
 
           # Produce a binary artifact and place it in the mounted volume
           run: |
-            for p in re rem; do
+            for p in re; do
               cmake -S $p -B $p/build -DCMAKE_C_FLAGS="-Werror" -DCMAKE_BUILD_TYPE=Debug
               cmake --build $p/build -j
             done
-            for p in re rem; do
+            for p in re; do
               mv $p ../.
             done
             cmake -B build -DCMAKE_C_FLAGS="-Werror" -DCMAKE_BUILD_TYPE=Debug

CMakeLists.txt

@@ -22,7 +22,6 @@ list(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_LIST_DIR}/cmake)
 #
 
 find_package(RE REQUIRED)
-find_package(REM REQUIRED)
 
 ##############################################################################
 #
@@ -62,7 +61,6 @@ endif()
 include_directories(
   src
   ${RE_INCLUDE_DIRS}
-  ${REM_INCLUDE_DIRS}
 )
 
 find_package(re CONFIG REQUIRED HINTS ../re/cmake)
@@ -164,7 +162,7 @@ endif()
 # Main target object
 #
 
-set(LINKLIBS ${REM_LIBRARIES} ${RE_LIBRARIES} ${OPENSSL_LIBRARIES})
+set(LINKLIBS ${RE_LIBRARIES} ${OPENSSL_LIBRARIES})
 if(WIN32)
   list(APPEND LINKLIBS qwave iphlpapi wsock32 ws2_32)
 else()