fix makefile

git-svn-id: file:///raid/svn-main/nishi-dataworks/trunk@215 d4a5a174-5a4a-5b4b-b672-37683c10d7d5

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 8523134b324f1ccc922b1a888cb9e90e59407782..975b02309dbfaf6ddfedb359c70cc69a898e64e2 100644 (file)
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -22,16 +22,22 @@ jobs:
         restore-keys: pkgcache-
     - name: Install packages
       run: sudo apt-get install zip byacc flex doxygen mingw-w64 graphviz
+    - name: make sure it is clean (linux64)
+      run: make clean
     - name: make for linux64
-      run: make YACC=byacc -j3 clean archive
+      run: make YACC=byacc -j3 archive
     - name: rename to -linux64
       run: mv dataworks.tar.gz dataworks-linux64.tar.gz
+    - name: make sure it is clean (win32)
+      run: make clean
     - name: make for win32
-      run: make YACC=byacc PLATFORM=win32 -j3 clean archive
+      run: make YACC=byacc PLATFORM=win32 -j3 archive
     - name: rename to -win32
       run: mv dataworks.tar.gz dataworks-win32.tar.gz
+    - name: make sure it is clean (win64)
+      run: make clean
     - name: make for win64
-      run: make YACC=byacc PLATFORM=win64 -j3 clean archive
+      run: make YACC=byacc PLATFORM=win64 -j3 archive
     - name: rename to -win64
       run: mv dataworks.tar.gz dataworks-win64.tar.gz
     - name: release

diff --git a/common.mk b/common.mk
index c931c3b991920bd6a348c7f8368b0374d43bb15a..ffd64b98b8db36fb709784a44fd00355d1120d30 100644 (file)
--- a/common.mk
+++ b/common.mk
@@ -35,7 +35,6 @@ format:
        clang-format -i $(FILES)
 
 clean:
-       rm -f *.zip *.tar.gz
        $(MAKE) -C ./Grammar clean $(COMPILE_FLAGS)
        $(MAKE) -C ./Library clean $(COMPILE_FLAGS)
        $(MAKE) -C ./Client clean $(COMPILE_FLAGS)
@@ -43,7 +42,7 @@ clean:
        $(MAKE) -C ./Document clean $(COMPILE_FLAGS)
 
 archive-prepare: all
-       rm -f *.zip *.tar.gz
+       rm -f dataworks.zip dataworks.tar.gz
        rm -rf dataworks-dist
        mkdir -p dataworks-dist
        mkdir -p dataworks-dist/Server