From c79349bb2db93a4152a045cfb41b1ef5249eb8e8 Mon Sep 17 00:00:00 2001
From: David Wehr <dawehr@iastate.edu>
Date: Sun, 2 Apr 2017 14:39:30 -0500
Subject: [PATCH] Updated gen_diagram Makefile properly.
---
quad/src/computation_graph/computation_graph.c | 6 +++---
quad/src/gen_diagram/Makefile | 5 +++--
quad/src/gen_diagram/generate.c | 1 +
3 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/quad/src/computation_graph/computation_graph.c b/quad/src/computation_graph/computation_graph.c
index f20a0d0f5..81ebbf44e 100644
--- a/quad/src/computation_graph/computation_graph.c
+++ b/quad/src/computation_graph/computation_graph.c
@@ -11,9 +11,9 @@ static double exec_input_vals[GRAPH_MAX_INPUTS];
// Macro functions for setting and clearing single bits in int array
// From http://www.mathcs.emory.edu/~cheung/Courses/255/Syllabus/1-C-intro/bit-array.html
-#define setBit(A,k) ( A[(k / (8*sizeof(&A)))] |= (1 << (k % (8*sizeof(&A)))) )
-#define clearBit(A,k) ( A[(k / (8*sizeof(&A)))] &= ~(1 << (k % (8*sizeof(&A)))) )
-#define testBit(A,k) ( A[(k / (8*sizeof(&A)))] & (1 << (k % (8*sizeof(&A)))) )
+#define setBit(A,k) ( A[(k / (8*sizeof(*A)))] |= (1 << (k % (8*sizeof(*A)))) )
+#define clearBit(A,k) ( A[(k / (8*sizeof(*A)))] &= ~(1 << (k % (8*sizeof(*A)))) )
+#define testBit(A,k) ( A[(k / (8*sizeof(*A)))] & (1 << (k % (8*sizeof(*A)))) )
struct computation_graph *create_graph() {
struct computation_graph *the_graph = malloc(sizeof(struct computation_graph));
diff --git a/quad/src/gen_diagram/Makefile b/quad/src/gen_diagram/Makefile
index 302077f0c..d0b152511 100644
--- a/quad/src/gen_diagram/Makefile
+++ b/quad/src/gen_diagram/Makefile
@@ -1,6 +1,7 @@
TOP=../..
NAME = gen_diagram
-REQLIBS = -lquad_app, -lgraph_blocks, -lcomputation_graph
+REQLIBS = -lquad_app -lgraph_blocks -lcomputation_graph -lm
-include $(TOP)/library.mk
\ No newline at end of file
+
+include $(TOP)/executable.mk
\ No newline at end of file
diff --git a/quad/src/gen_diagram/generate.c b/quad/src/gen_diagram/generate.c
index 9b7b32372..3e712a2c0 100644
--- a/quad/src/gen_diagram/generate.c
+++ b/quad/src/gen_diagram/generate.c
@@ -1,4 +1,5 @@
#include <stdio.h>
+#include "computation_graph.h"
#include "control_algorithm.h"
int main() {
--
GitLab