fix makefile

Author: JordyAaldering

Makefile

@@ -1,13 +1,13 @@
-BUILD_DIR ?= build
-SAC2C_EXEC ?= sac2c
+SAC2C ?= sac2c
 TARGETS ?= "seq;seq_checks;mt_pth"
+BUILD_DIR ?= build
 
 .PHONY: all build clean
 
 all: build
 
 build:
-	cmake -DTARGETS=$(TARGETS) -DSAC2C_EXEC=$(SAC2C_EXEC) -B $(BUILD_DIR)
+	cmake -DSAC2C_EXEC=$(SAC2C) -DTARGETS=$(TARGETS) -B $(BUILD_DIR)
 	cmake --build $(BUILD_DIR)
 
 clean:

README.md

@@ -1,17 +1,9 @@
 # SaC Image Formats
 
 The project uses `cmake-common`.
-Upon cloning this repo it is important initialize submodules:
+Upon cloning this repo it is important initialize submodules.
 
-```
+```bash
 git submodule update --init --recursive
-```
-
-Then build the library using `make`:
-
-```
-mkdir build
-cd build
-cmake -DTARGETS="<targets>" ..
 make
 ```

src/CMakeLists.txt

@@ -57,11 +57,8 @@ FOREACH (name ${SAC_SRC})
     SET (tree "${DLL_BUILD_DIR}/tree/${TARGET_ENV}/${SBI}/lib${dst}Tree${VARIANT}${TREE_DLLEXT}")
 
     RESOLVE_SAC_DEPS_AS_TARGETS ("${name}" "<TARGET>-module-<NAME>" target_list object_list source_list)
-    MESSAGE ("Targets of ${name} => ${target_list}")
-    MESSAGE ("Objects of ${name} => ${object_list}")
-    MESSAGE ("Sources of ${name} => ${source_list}")
-
     LIST (APPEND deps_list ${target_list} ${object_list} ${source_list})
+    MESSAGE (STATUS "Dependencies of ${name} are: ${deps_list}")
     UNSET (target_list)
     UNSET (object_list)
     UNSET (source_list)

src/JPEG.sac

@@ -1,49 +1,47 @@
 module JPEG;
 
-use Color8:       { Color8, shape };
-use File:         { File, fopen, fclose };
+use Color8: { Color8, shape };
+use File: { File, fopen, fclose };
 use RuntimeError: { error };
-use ScalarArith:  { == };
-use String:       { string };
+use ScalarArith: { == };
+use String: { string };
 
-export {readJPEG, writeJPEG};
+export { readJPEG, writeJPEG };
 
-external Color8[.,.] readJPEGFile( File &stream );
+external Color8[.,.] readJPEGFile(File &stream);
     #pragma effect FileSystem::TheFileSystem
     #pragma linkobj "JPEG/jpeg.o"
     #pragma linkname "SAC_JPEG_jpeg2array"
     #pragma linkwith "jpeg"
     #pragma refcounting[0]
 
-external void writeJPEGFile( File &stream , Color8[.,.] image, int[2] shp, int quality);
+external void writeJPEGFile(File &stream, Color8[.,.] image, int[2] shp, int quality);
     #pragma effect FileSystem::TheFileSystem
     #pragma linkobj "JPEG/jpeg.o"
     #pragma linkname "SAC_JPEG_array2jpeg"
     #pragma linkwith "jpeg"
 
 inline
-Color8[.,.] readJPEG( string name)
+Color8[.,.] readJPEG(string name)
 {
-  err, fp = fopen( name, "rb");
-  if ( SysErr::fail(err) == true) {
-    error( (int)err, "Error occured when trying to open file %s for reading",
-           name);
-  }
-
-  ret = readJPEGFile( fp);
-  fclose( fp);
-  return( ret);
+    err, fp = fopen(name, "rb");
+    if (SysErr::fail(err)) {
+        error((int)err, "Error occured when trying to open file %s for reading", name);
+    }
+
+    ret = readJPEGFile(fp);
+    fclose(fp);
+    return(ret);
 }
 
 inline
-void writeJPEG( Color8[.,.] img, string name, int quality)
+void writeJPEG(Color8[.,.] img, string name, int quality)
 {
-  err, fp = fopen( name, "wb+");
-  if ( SysErr::fail(err) == true) {
-    error( (int)err, "Error occured when trying to open file %s for writing",
-           name);
-  }
-
-  writeJPEGFile( fp, img, shape(img), quality);
-  fclose( fp);
+    err, fp = fopen(name, "wb+");
+    if (SysErr::fail(err)) {
+        error((int)err, "Error occured when trying to open file %s for writing", name);
+    }
+
+    writeJPEGFile(fp, img, shape(img), quality);
+    fclose(fp);
 }

src/PGM.sac

@@ -145,8 +145,7 @@ int[.,.], int readPGM(File stream)
 PGM openPGM(string name)
 {
     err, fp = fopen(name, "rb");
-
-    if (fail(err) == true) {
+    if (fail(err)) {
         RuntimeError::error((int)err,
             "openPGM: Failed to open file %s for reading",
             name);
@@ -165,8 +164,7 @@ PGM openPGM(string name)
 void writePGM(int[2:shp] image, int[2] shp, int mval, bool binary, string name)
 {
     err, fp = fopen(name, "wb");
-
-    if (fail(err) == true) {
+    if (fail(err)) {
         RuntimeError::error((int)err,
             "writePGM: Failed to open file %s for reading",
             name);

src/PNG.sac

@@ -66,6 +66,5 @@ int showPNG(Color8[.,.] array)
     cmd = sprintf("(display '%s' || xv '%s' || firefox '%s')",
                   name, name, name);
     _ = system(cmd);
-
     return ret;
 }

src/PPM.sac

@@ -22,13 +22,13 @@ external Color8[.,.] readStream(File &stream);
     #pragma refcounting [0]
     #pragma linksign [1,2]
 
-external void writeStream(TermFile &stream , Color8[.,.] image,
+external void writeStream(TermFile &stream, Color8[.,.] image,
                           int[2] shp, bool binary);
     #pragma effect Terminal::TheTerminal
     #pragma linkobj "src/PPM/array2ppm.o"
     #pragma linkname "SAC_PPM_array2ppm"
 
-external void writeStream(File &stream , Color8[.,.] image,
+external void writeStream(File &stream, Color8[.,.] image,
                           int[2] shp, bool binary);
     #pragma effect FileSystem::TheFileSystem
     #pragma linkobj "src/PPM/array2ppm.o"
@@ -42,8 +42,7 @@ inline Color8[.,.] readPPM()
 inline Color8[.,.] readPPM(string name)
 {
     err, fp = fopen(name, "r");
-
-    if (SysErr::fail(err) == true) {
+    if (SysErr::fail(err)) {
         RuntimeError::error((int)err,
             "Error occured when trying to open file %s for reading",
             name);
@@ -62,8 +61,7 @@ inline void printPPM(Color8[2:shp] img)
 inline void printPPM(Color8[2:shp] img, string name, bool binary)
 {
     err, fp = fopen(name, "w+");
-
-    if (SysErr::fail(err) == true) {
+    if (SysErr::fail(err)) {
         RuntimeError::error((int)err,
             "Error occured when trying to open file %s for writing",
             name);