projects
/
satune.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
4fc3453
)
edit
author
bdemsky
<bdemsky@uci.edu>
Fri, 25 Aug 2017 02:41:44 +0000
(19:41 -0700)
committer
bdemsky
<bdemsky@uci.edu>
Fri, 25 Aug 2017 02:41:44 +0000
(19:41 -0700)
src/Makefile
patch
|
blob
|
history
src/classlist.h
patch
|
blob
|
history
diff --git
a/src/Makefile
b/src/Makefile
index c2d10b7b43536d3fcb22c56e4a7b19301f7451f1..5adb178ee6b95c31692f857c4d424bc09bb396e3 100644
(file)
--- a/
src/Makefile
+++ b/
src/Makefile
@@
-6,9
+6,11
@@
OBJ_DIR = bin
CPP_SOURCES := $(wildcard *.cc) $(wildcard AST/*.cc) $(wildcard ASTTransform/*.cc) $(wildcard ASTAnalyses/*.cc) $(wildcard Tuner/*.cc) $(wildcard Collections/*.cc) $(wildcard Backend/*.cc) $(wildcard Encoders/*.cc)
CPP_SOURCES := $(wildcard *.cc) $(wildcard AST/*.cc) $(wildcard ASTTransform/*.cc) $(wildcard ASTAnalyses/*.cc) $(wildcard Tuner/*.cc) $(wildcard Collections/*.cc) $(wildcard Backend/*.cc) $(wildcard Encoders/*.cc)
+C_SOURCES := $(wildcard *.c) $(wildcard AST/*.c) $(wildcard ASTTransform/*.c) $(wildcard ASTAnalyses/*.c) $(wildcard Tuner/*.c) $(wildcard Collections/*.c) $(wildcard Backend/*.c) $(wildcard Encoders/*.c)
+
HEADERS := $(wildcard *.h) $(wildcard AST/*.h) $(wildcard ASTTransform/*.h) $(wildcard ASTAnalyses/*.h) $(wildcard Tuner/*.h) $(wildcard Collections/*.h) $(wildcard Backend/*.h) $(wildcard Encoders/*.h)
HEADERS := $(wildcard *.h) $(wildcard AST/*.h) $(wildcard ASTTransform/*.h) $(wildcard ASTAnalyses/*.h) $(wildcard Tuner/*.h) $(wildcard Collections/*.h) $(wildcard Backend/*.h) $(wildcard Encoders/*.h)
-OBJECTS := $(CPP_SOURCES:%.cc=$(OBJ_DIR)/%.o)
+OBJECTS := $(CPP_SOURCES:%.cc=$(OBJ_DIR)/%.o)
$(C_SOURCES:%.c=$(OBJ_DIR)/%.o)
CFLAGS := -Wall -g -O0
CFLAGS += -IAST -IASTTransform -IASTAnalyses -ICollections -IBackend -I. -IEncoders -ITuner
CFLAGS := -Wall -g -O0
CFLAGS += -IAST -IASTTransform -IASTAnalyses -ICollections -IBackend -I. -IEncoders -ITuner
@@
-48,9
+50,12
@@
docs: $(C_SOURCES) $(HEADERS)
doxygen
${OBJ_DIR}/$(LIB_SO): $(OBJECTS)
doxygen
${OBJ_DIR}/$(LIB_SO): $(OBJECTS)
- $(C
C
) -g $(SHARED) -o ${OBJ_DIR}/$(LIB_SO) $+ $(LDFLAGS)
+ $(C
XX
) -g $(SHARED) -o ${OBJ_DIR}/$(LIB_SO) $+ $(LDFLAGS)
${OBJ_DIR}/%.o: %.cc
${OBJ_DIR}/%.o: %.cc
+ $(CXX) -fPIC -c $< -o $@ $(CFLAGS) -Wno-unused-variable
+
+${OBJ_DIR}/%.o: %.c
$(CC) -fPIC -c $< -o $@ $(CFLAGS) -Wno-unused-variable
-include $(OBJECTS:%=$OBJ_DIR/.%.d)
$(CC) -fPIC -c $< -o $@ $(CFLAGS) -Wno-unused-variable
-include $(OBJECTS:%=$OBJ_DIR/.%.d)
diff --git
a/src/classlist.h
b/src/classlist.h
index cd0cc827fb670138e8504b0609c512c4f779fd76..38aee744173f28a58c418eb737278b3dcf3fc01e 100644
(file)
--- a/
src/classlist.h
+++ b/
src/classlist.h
@@
-26,10
+26,6
@@
class BooleanVar;
class BooleanLogic;
class BooleanPredicate;
class ASTNode;
class BooleanLogic;
class BooleanPredicate;
class ASTNode;
-
-struct IncrementalSolver;
-typedef struct IncrementalSolver IncrementalSolver;
-
class Set;
typedef class Set MutableSet;
class Set;
typedef class Set MutableSet;
@@
-48,6
+44,9
@@
class PredicateOperator;
class Table;
class Order;
class Table;
class Order;
+struct IncrementalSolver;
+typedef struct IncrementalSolver IncrementalSolver;
+
struct OrderPair;
typedef struct OrderPair OrderPair;
struct OrderPair;
typedef struct OrderPair OrderPair;