update CI scripts

.gitlab-ci.yml

@@ -11,10 +11,12 @@ job_miniupnpd:
     stage: build
     script:
         - "cd miniupnpd"
-        - "make -j3 -f Makefile.linux && make -f Makefile.linux check"
-        - "make -f Makefile.linux clean"
-        - "make -j3 -f Makefile.linux_nft"
-        - "make -f Makefile.linux_nft dox"
+        - "./configure"
+        - "make -j3 && make check"
+        - "make dox"
+        - "make clean"
+        - "./configure --firewall=nftables"
+        - "make -j3"
 
 # i686-w64-mingw32-gcc
 job_miniupnpc:

.travis.yml

@@ -47,23 +47,17 @@ before_install:
 
 script:
   - 'cd $TRAVIS_BUILD_DIR && cd $PROJECT'
-  - MAKEFILE=Makefile && if [ -f Makefile.linux -a "$TRAVIS_OS_NAME" = "linux" ]; then
-      MAKEFILE=Makefile.linux ;
-    elif [ -f Makefile.macosx -a "$TRAVIS_OS_NAME" = "osx" ]; then
-      MAKEFILE=Makefile.macosx;
-    fi
-  - if [ "$MAKEFILE" = "Makefile.macosx" ]; then
-      make -f $MAKEFILE depend;
-    fi
-  - 'CONFIG_OPTIONS="--ipv6 --igd2" make -f $MAKEFILE -j3'
-  - make -f $MAKEFILE check
+  - 'if [ "$PROJECT" = "miniupnpd" ] ; then ./configure --ipv6 --igd2 ; fi'
+  - 'make -j3'
+  - 'make check'
   - if [ "$TRAVIS_OS_NAME" = "linux" ] && [ "$PROJECT" = "miniupnpd" ]; then
-      make -f Makefile.linux_nft clean ;
-      CONFIG_OPTIONS="--ipv6 --igd2" make -f Makefile.linux_nft -j3 ;
+      make dox ;
+      make clean ;
+      ./configure --ipv6 --igd2 --firewall=nftables ;
+      make -j3 ;
     fi
-  - 'if [ "$TRAVIS_OS_NAME" = "linux" ] && [ "$PROJECT" = "miniupnpd" ]; then make -f $MAKEFILE dox ; fi'
   - if [ "$PROJECT" = "miniupnpc" ]; then
-      INSTALLPREFIX="$HOME/_pythonmodule" make -f $MAKEFILE pythonmodule;
+      INSTALLPREFIX="$HOME/_pythonmodule" make pythonmodule;
     fi
   - if [ -f "CMakeLists.txt" ] ; then
       mkdir cmake-build && cd cmake-build &&
@@ -71,4 +65,4 @@ script:
     fi
 
 after_success:
-  - 'INSTALLPREFIX="$HOME/$PROJECT" make -f $MAKEFILE install'
+  - 'INSTALLPREFIX="$HOME/$PROJECT" make install'