makefile

jsoftware · Oct 31, 2024 · f05a926 · f05a926
1 parent 335733f
commit f05a926
Show file tree

Hide file tree

Showing 10 changed files with 48 additions and 14 deletions.
diff --git a/hostdefs/makefile b/hostdefs/makefile
@@ -33,7 +33,10 @@ $(TARGET) : $(OBJS)
 
 all: $(TARGET)
 
+noclean:
+	#
+
 clean:
 	rm -f *.res *.ilk *.pdb $(OBJS)
 
-.PHONY: all clean
+.PHONY: all clean noclean
diff --git a/makemsvc/jamalgam/makefile b/makemsvc/jamalgam/makefile
@@ -5,6 +5,7 @@ FAVX2= /DC_AVX2=1 -DHAVE_AVX2=1 -DBASE64_AVX2_USE_ASM=1 -march=haswell -mno-vzer
 endif
 ifeq (1,$(USE_OPENMP))
 FOPENMP= -Xclang -fopenmp
+LOPENMP= libomp.lib
 endif
 USE_SLEEF=1
 ifeq (ARM64,$(TARGET_CPU))
@@ -337,14 +338,17 @@ SYNCLIB= synchronization.lib
 endif
 
 $(TARGET) : $(OBJS) $(OBJSLN) $(SRC_ASM) $(OBJS_ASM) $(OBJS_SLEEF) $(ASM) $(PTHREADLIB) jconsole.res
-	$(LD) /NOLOGO /DEF:$(DEF) $(FLAGS) /out:$@ $(OBJS) $(OBJSLN) $(SRC_ASM) $(OBJS_ASM) $(OBJS_SLEEF) $(ASM) $(PTHREADLIB) $(MPIRLIB) jconsole.res ole32.lib advapi32.lib oleaut32.lib onecore.lib $(SYNCLIB)
+	$(LD) /NOLOGO /DEF:$(DEF) $(FLAGS) /out:$@ $(OBJS) $(OBJSLN) $(SRC_ASM) $(OBJS_ASM) $(OBJS_SLEEF) $(ASM) $(PTHREADLIB) $(MPIRLIB) jconsole.res ole32.lib advapi32.lib oleaut32.lib onecore.lib $(SYNCLIB) $(LOPENMP)
 
 jconsole.res : $(RCS)
 	$(RC) /L 0x409 /D _USING_V110_SDK71_ -R -FO$@ $(RCS)
 
 all: $(TARGET)
 
+noclean:
+	#
+
 clean:
 	rm -f *.lib *.exp *.res *.ilk *.pdb $(OBJS) $(OBJSLN) $(OBJS_SLEEF) $(SRC_ASM)
 
-.PHONY: all clean
+.PHONY: all clean nonclean
diff --git a/makemsvc/jamalgam/makefile.win b/makemsvc/jamalgam/makefile.win
@@ -5,6 +5,7 @@ FAVX2= /DC_AVX2=1 -DHAVE_AVX2=1 -DBASE64_AVX2_USE_ASM=1 -march=haswell -mno-vzer
 !endif
 !if "1"=="$(USE_OPENMP)"
 FOPENMP= -Xclang -fopenmp
+LOPENMP= libomp.lib
 !endif
 USE_SLEEF=1
 !if "ARM64"=="$(TARGET_CPU)"
@@ -338,14 +339,17 @@ SYNCLIB= synchronization.lib
 !endif
 
 $(TARGET) : $(OBJS) $(OBJSLN) $(SRC_ASM) $(OBJS_ASM) $(OBJS_SLEEF) $(ASM) $(PTHREADLIB) jconsole.res
-	$(LD) /NOLOGO /DEF:$(DEF) $(FLAGS) /out:$@ $(OBJS) $(OBJSLN) $(SRC_ASM) $(OBJS_ASM) $(OBJS_SLEEF) $(ASM) $(PTHREADLIB) $(MPIRLIB) jconsole.res ole32.lib advapi32.lib oleaut32.lib onecore.lib $(SYNCLIB)
+	$(LD) /NOLOGO /DEF:$(DEF) $(FLAGS) /out:$@ $(OBJS) $(OBJSLN) $(SRC_ASM) $(OBJS_ASM) $(OBJS_SLEEF) $(ASM) $(PTHREADLIB) $(MPIRLIB) jconsole.res ole32.lib advapi32.lib oleaut32.lib onecore.lib $(SYNCLIB) $(LOPENMP)
 
 jconsole.res : $(RCS)
 	$(RC) /L 0x409 /D _USING_V110_SDK71_ -R -FO$@ $(RCS)
 
 all: $(TARGET)
 
+noclean:
+	#
+
 clean:
 	erase /q *.lib *.exp *.res *.ilk *.pdb ..\..\jsrc\*.o ..\..\jsrc\blis\*.o ..\..\jsrc\openssl\sha\*.o ..\..\dllsrc\*.o ..\..\sleef\src\common\*.o ..\..\sleef\src\libm\*.o  ..\..\base64\lib\*.o ..\..\base64\lib\tables\*.o ..\..\base64\lib\arch\avx\*.o ..\..\base64\lib\arch\avx2\*.o ..\..\base64\lib\arch\avx512\*.o ..\..\base64\lib\arch\generic\*.o ..\..\base64\lib\arch\generic\32\*.o ..\..\base64\lib\arch\generic\64\*.o ..\..\base64\lib\arch\neon64\*.o ..\..\base64\lib\arch\ssse3\*.o ..\..\base64\lib\arch\sse41\*.o ..\..\base64\lib\arch\sse42\*.o
 
-.PHONY: all clean
+.PHONY: all clean noclean
diff --git a/makemsvc/jconsole/makefile b/makemsvc/jconsole/makefile
@@ -61,7 +61,10 @@ jconsole.res : $(RCS)
 
 all: $(TARGET)
 
+noclean:
+	#
+
 clean:
 	rm -f *.res *.ilk *.pdb $(OBJS) $(OBJSLN)
 
-.PHONY: all clean
+.PHONY: all clean noclean
diff --git a/makemsvc/jconsole/makefile.win b/makemsvc/jconsole/makefile.win
@@ -61,7 +61,10 @@ jconsole.res : $(RCS)
 
 all: $(TARGET)
 
+noclean:
+	#
+
 clean:
 	erase /q *.res *.ilk *.pdb ..\..\jsrc\jconsole.o ..\..\jsrc\jeload.o ..\..\jsrc\linenoise.o
 
-.PHONY: all clean
+.PHONY: all clean noclean
diff --git a/makemsvc/jdll/makefile b/makemsvc/jdll/makefile
@@ -5,6 +5,7 @@ FAVX2= /DC_AVX2=1 -DHAVE_AVX2=1 -DBASE64_AVX2_USE_ASM=1 -march=haswell -mno-vzer
 endif
 ifeq (1,$(USE_OPENMP))
 FOPENMP= -Xclang -fopenmp
+LOPENMP= libomp.lib
 endif
 USE_SLEEF=1
 ifeq (ARM64,$(TARGET_CPU))
@@ -335,14 +336,17 @@ SYNCLIB= synchronization.lib
 endif
 
 $(TARGET) : $(OBJS) $(SRC_ASM) $(OBJS_ASM) $(OBJS_SLEEF) $(OBJS_SIMDUTF8) $(ASM) $(PTHREADLIB) jdll.res
-	$(LD) /NOLOGO /DEF:$(DEF) $(FLAGS) /out:$@ $(OBJS) $(SRC_ASM) $(OBJS_ASM) $(OBJS_SLEEF) $(OBJS_SIMDUTF8) $(ASM) $(PTHREADLIB) $(MPIRLIB) jdll.res ole32.lib advapi32.lib oleaut32.lib onecore.lib $(SYNCLIB)
+	$(LD) /NOLOGO /DEF:$(DEF) $(FLAGS) /out:$@ $(OBJS) $(SRC_ASM) $(OBJS_ASM) $(OBJS_SLEEF) $(OBJS_SIMDUTF8) $(ASM) $(PTHREADLIB) $(MPIRLIB) jdll.res ole32.lib advapi32.lib oleaut32.lib onecore.lib $(SYNCLIB) $(LOPENMP)
 
 jdll.res : $(RCS)
 	$(RC) /L 0x409 /D_USING_V110_SDK71_ -R -FO$@ $(RCS)
 
 all: $(TARGET)
 
+noclean:
+	#
+
 clean:
 	rm -f *.lib *.exp *.res *.ilk *.pdb $(OBJS) $(OBJS_SLEEF) $(OBJS_SIMDUTF8) $(SRC_ASM)
 
-.PHONY: all clean
+.PHONY: all clean noclean
diff --git a/makemsvc/jdll/makefile.win b/makemsvc/jdll/makefile.win
@@ -5,6 +5,7 @@ FAVX2= /DC_AVX2=1 -DHAVE_AVX2=1 -DBASE64_AVX2_USE_ASM=1 -march=haswell -mno-vzer
 !endif
 !if "1"=="$(USE_OPENMP)"
 FOPENMP= -Xclang -fopenmp
+LOPENMP= libomp.lib
 !endif
 USE_SLEEF=1
 !if "ARM64"=="$(TARGET_CPU)"
@@ -335,14 +336,17 @@ SYNCLIB= synchronization.lib
 !endif
 
 $(TARGET) : $(OBJS) $(SRC_ASM) $(OBJS_ASM) $(OBJS_SLEEF) $(OBJS_SIMDUTF8) $(ASM) $(PTHREADLIB) jdll.res
-	$(LD) /NOLOGO /DEF:$(DEF) $(FLAGS) /out:$@ $(OBJS) $(SRC_ASM) $(OBJS_ASM) $(OBJS_SLEEF) $(OBJS_SIMDUTF8) $(ASM) $(PTHREADLIB) $(MPIRLIB) jdll.res ole32.lib advapi32.lib oleaut32.lib onecore.lib $(SYNCLIB)
+	$(LD) /NOLOGO /DEF:$(DEF) $(FLAGS) /out:$@ $(OBJS) $(SRC_ASM) $(OBJS_ASM) $(OBJS_SLEEF) $(OBJS_SIMDUTF8) $(ASM) $(PTHREADLIB) $(MPIRLIB) jdll.res ole32.lib advapi32.lib oleaut32.lib onecore.lib $(SYNCLIB) $(LOPENMP)
 
 jdll.res : $(RCS)
 	$(RC) /L 0x409 /D_USING_V110_SDK71_ -R -FO$@ $(RCS)
 
 all: $(TARGET)
 
+noclean:
+	#
+
 clean:
 	erase /q *.lib *.exp *.res *.ilk *.pdb ..\..\jsrc\*.o ..\..\jsrc\blis\*.o ..\..\jsrc\openssl\sha\*.o ..\..\dllsrc\*.o ..\..\sleef\src\common\*.o ..\..\sleef\src\libm\*.o ..\..\sleef\src\quad\*.o  ..\..\jsrc\utf\*.o  ..\..\base64\lib\*.o ..\..\base64\lib\tables\*.o ..\..\base64\lib\arch\avx\*.o ..\..\base64\lib\arch\avx2\*.o ..\..\base64\lib\arch\avx512\*.o ..\..\base64\lib\arch\generic\*.o ..\..\base64\lib\arch\generic\32\*.o ..\..\base64\lib\arch\generic\64\*.o ..\..\base64\lib\arch\neon64\*.o ..\..\base64\lib\arch\ssse3\*.o ..\..\base64\lib\arch\sse41\*.o ..\..\base64\lib\arch\sse42\*.o
 
-.PHONY: all clean
+.PHONY: all clean noclean
diff --git a/makemsvc/tsdll/makefile b/makemsvc/tsdll/makefile
@@ -45,7 +45,10 @@ jddll.res : $(RCS)
 
 all: $(TARGET)
 
+noclean:
+	#
+
 clean:
 	rm -f *.lib *.exp *.res $(OBJS)
 
-.PHONY: all clean
+.PHONY: all clean noclean
diff --git a/makemsvc/tsdll/makefile.win b/makemsvc/tsdll/makefile.win
@@ -45,7 +45,10 @@ jddll.res : $(RCS)
 
 all: $(TARGET)
 
+noclean:
+	#
+
 clean:
 	erase /q *.lib *.exp *.res ..\..\jsrc\tsdll.o
 
-.PHONY: all clean
+.PHONY: all clean noclean
diff --git a/netdefs/makefile b/netdefs/makefile
@@ -33,7 +33,10 @@ $(TARGET) : $(OBJS)
 
 all: $(TARGET)
 
+noclean:
+	#
+
 clean:
 	rm -f *.res *.ilk *.pdb $(OBJS)
 
-.PHONY: all clean
+.PHONY: all clean noclean