[Opengtoolkit-svn] SF.net SVN: opengtoolkit:[1601] trunk/lvzip/c_source

[<lab...@us...>]

Revision: 1601
          http://sourceforge.net/p/opengtoolkit/svn/1601
Author:   labviewer
Date:     2019-09-14 14:19:12 +0000 (Sat, 14 Sep 2019)
Log Message:
-----------
Cleanup various makefiles somewhat

Modified Paths:
--------------
    trunk/lvzip/c_source/Makefile
    trunk/lvzip/c_source/Makefile.vxworks
    trunk/lvzip/c_source/zlibvc.vcproj

Removed Paths:
-------------
    trunk/lvzip/c_source/Makefile.x64

Modified: trunk/lvzip/c_source/Makefile
===================================================================
--- trunk/lvzip/c_source/Makefile	2019-09-13 16:17:41 UTC (rev 1600)
+++ trunk/lvzip/c_source/Makefile	2019-09-14 14:19:12 UTC (rev 1601)
@@ -33,6 +33,8 @@
 
 STATICLIB=lvzlib.a
 SHAREDLIB=liblvzlib.so
+SHAREDLIB32=lvzlib.so
+SHAREDLIB64=lvzlib64.so
 SHAREDLIBV=liblvzlib.so.4
 SHAREDLIBM=lvzlib.so
 LIBS=$(STATICLIB) $(SHAREDLIBV)
@@ -81,10 +83,10 @@
 all: static all64
 
 linux32: clean
-	$(MAKE) $(SHAREDLIBV) ODIR=./Linux_x86 CC_ARCH_SPEC="-m32"
+	$(MAKE) $(SHAREDLIB32) ODIR=./Linux_x86 CC_ARCH_SPEC="-m32"
 
 linux64: clean
-	$(MAKE) $(SHAREDLIBV) ODIR=./Linux_x64 CC_ARCH_SPEC="-m64"
+	$(MAKE) $(SHAREDLIB64) ODIR=./Linux_x64 CC_ARCH_SPEC="-m64"
 
 static: example$(EXE) minigzip$(EXE)
 
@@ -171,9 +173,9 @@
 	-@mkdir $(ODIR)/bzip2 2>/dev/null || test -d $(ODIR)/bzip2
 	$(CC) $(SFLAGS) -DPIC -c -o $(ODIR)/$*.lo $<
 
-placebo $(SHAREDLIBV): $(PIC_OBJS)
+placebo $(SHAREDLIBV) $(SHAREDLIB32) $(SHAREDLIB64): $(PIC_OBJS)
 	$(LDSHARED) $(SFLAGS) -shared -o $(ODIR)/$@ $(PIC_OBJS) $(LDSHAREDLIBC) $(LDFLAGS)
-	rm -f $(ODIR)/$(SHAREDLIB) $(ODIR)/$(SHAREDLIBM)
+	rm -f $(ODIR)/$(SHAREDLIB) $(ODIR)/$(SHAREDLIBM) $(ODIR)/$(SHAREDLIBV)
 #	ln -s $(ODIR)/$@ $(ODIR)/$(SHAREDLIB)
 #	ln -s $(ODIR)/$@ $(ODIR)/$(SHAREDLIBM)
 

Modified: trunk/lvzip/c_source/Makefile.vxworks
===================================================================
--- trunk/lvzip/c_source/Makefile.vxworks	2019-09-13 16:17:41 UTC (rev 1600)
+++ trunk/lvzip/c_source/Makefile.vxworks	2019-09-14 14:19:12 UTC (rev 1601)
@@ -5,10 +5,10 @@
 ADDED_CFLAGS = -DHAVE_AES -DHAVE_BZIP2 -DNO_BZ_STDIO
 
 ifeq ($(DEBUG_MODE),1)
-OBJ_DIR := PPC603gnu_DEBUG
+OBJ_DIR := $(OBJ_BASE)/Debug
 CFLAGS = -g -mlongcall
 else
-OBJ_DIR := PPC603gnu
+OBJ_DIR := $(OBJ_BASE)/Release
 CFLAGS = -Os -fstrength-reduce -fno-builtin -fno-strict-aliasing -mlongcall
 endif
 

Deleted: trunk/lvzip/c_source/Makefile.x64
===================================================================
--- trunk/lvzip/c_source/Makefile.x64	2019-09-13 16:17:41 UTC (rev 1600)
+++ trunk/lvzip/c_source/Makefile.x64	2019-09-14 14:19:12 UTC (rev 1601)
@@ -1,87 +0,0 @@
-# Nmake macros for building makefile
-!include <win32.mak>
-
-PROJ = LVZLIB 
-
-all: $(OUTDIR) $(OUTDIR)\lvzlib.dll
-
-"$(OUTDIR)" :
-    if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
-    
-#--------------------------------------------------------------------#
-
-SOURCES=adler32.c \
-        compress.c \
-        crc32.c \
-        deflate.c \
-        gzclose.c \
-		gzlib.c \
-		gzread.c \
-		gzwrite.c \
-		infback.c \
-        inffast.c \
-        inflate.c \
-        inftrees.c \
-        ioapi.c \
-        iowin.c \
-        iomem.c \
-		lvapi.c \
-        lvutil.c \
-	    mztools.c \
-		trees.c \
-        uncompr.c \
-        unzip.c \
-        zip.c \
-        zutil.c
-		
-OBJS=$(OUTDIR)\adler32.obj \
-     $(OUTDIR)\compress.obj \
-     $(OUTDIR)\crc32.obj \
-     $(OUTDIR)\deflate.obj \
-     $(OUTDIR)\gzclose.obj \
-	 $(OUTDIR)\gzlib.obj \
-	 $(OUTDIR)\gzread.obj \
-	 $(OUTDIR)\gzwrite.obj \
-     $(OUTDIR)\infback.obj \
-     $(OUTDIR)\inffast.obj \
-     $(OUTDIR)\inflate.obj \
-     $(OUTDIR)\inftrees.obj \
-     $(OUTDIR)\ioapi.obj \
-	 $(OUTDIR)\iowin.obj \
-     $(OUTDIR)\iomem.obj \
-	 $(OUTDIR)\lvapi.obj \
-     $(OUTDIR)\lvutil.obj \
-	 $(OUTDIR)\mztools.obj \
-     $(OUTDIR)\trees.obj \
-     $(OUTDIR)\uncompr.obj \
-     $(OUTDIR)\unzip.obj \
-     $(OUTDIR)\zip.obj \
-     $(OUTDIR)\zutil.obj
-
-ELIBS=user32.lib kernel32.lib labview.lib
-
-# Build rules for resource files
-  
-# Update the resources
-  
-$(OUTDIR)\lvzlib.res: zlib.rc 
-    $(rc) $(rcflags) $(rcvars) /fo $(OUTDIR)\lvzlib.res zlib.rc
-
-# Compile the sources
-
-.c{$(OUTDIR)}.obj:
-    $(cc) $(cdebug) $(cflags) $(cvarsdll) /Fp"$(OUTDIR)\\" /Fo"$(OUTDIR)\\" /Fd"$(OUTDIR)\\" $**
-    
-# Update the import library
-
-$(OUTDIR)\lvzlib.exp: $(OBJS) lvzlib.def
-    $(implib) -machine:$(CPU) -def:lvzlib.def -out:$(OUTDIR)\lvzlib.lib $(OBJS)
-
-# Update the dynamic link library
-
-$(OUTDIR)\lvzlib.dll: $(OBJS) $(OUTDIR)\lvzlib.res $(OUTDIR)\lvzlib.exp lvzlib.def
-	$(link) $(ldebug) $(dlllflags) $(conlibsdll) /MACHINE:$(CPU) -out:$(OUTDIR)\lvzlib.dll  \
-	$(OBJS) $(ELIBS) $(OUTDIR)\lvzlib.exp $(OUTDIR)\lvzlib.res
-
-clean:
-	$(CLEANUP)
\ No newline at end of file

Modified: trunk/lvzip/c_source/zlibvc.vcproj
===================================================================
--- trunk/lvzip/c_source/zlibvc.vcproj	2019-09-13 16:17:41 UTC (rev 1600)
+++ trunk/lvzip/c_source/zlibvc.vcproj	2019-09-14 14:19:12 UTC (rev 1601)
@@ -519,7 +519,7 @@
 				Name="VCLinkerTool"
 				IgnoreImportLibrary="true"
 				AdditionalDependencies="labview64.lib"
-				OutputFile="$(OutDir)\lvzlib.dll"
+				OutputFile="$(OutDir)\lvzlib64.dll"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories="../../cintools"

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.