From ed7fe43cc22f18f40e0b70b859d46a70466e011d Mon Sep 17 00:00:00 2001
From: Jan Travnicek <Jan.Travnicek@fit.cvut.cz>
Date: Tue, 28 Jan 2014 07:59:05 +0100
Subject: [PATCH] new makefiles and determinized NFSM1

---
 alib/makefile          |  8 +++---
 examples/NFSM1.DET.xml | 60 ++++++++++++++++++++++++++++++++++++++++++
 makefile               |  4 +--
 3 files changed, 66 insertions(+), 6 deletions(-)
 create mode 100644 examples/NFSM1.DET.xml

diff --git a/alib/makefile b/alib/makefile
index 73250891cf..c397f43efc 100644
--- a/alib/makefile
+++ b/alib/makefile
@@ -6,10 +6,10 @@ LDFLAGS= -shared -lxml2
 SOURCES=$(shell find src/ -name *cpp)
 OBJECTS=$(patsubst src/%.cpp, obj/%.o, $(SOURCES))
 
-all: $(SOURCES) bin/$(LIBRARY)
+all: $(SOURCES) lib/$(LIBRARY)
 
-bin/$(LIBRARY): $(OBJECTS) 
-	mkdir -p bin
+lib/$(LIBRARY): $(OBJECTS)
+	mkdir -p lib
 	$(CC) $(LDFLAGS) $(OBJECTS) -o $@
 
 obj/%.o: src/%.cpp
@@ -17,4 +17,4 @@ obj/%.o: src/%.cpp
 	$(CC) $(CCFLAGS) $< -o $@
 
 clean:
-	$(RM) -r *.o *.d bin obj
+	$(RM) -r *.o *.d lib obj
diff --git a/examples/NFSM1.DET.xml b/examples/NFSM1.DET.xml
new file mode 100644
index 0000000000..1a550357ab
--- /dev/null
+++ b/examples/NFSM1.DET.xml
@@ -0,0 +1,60 @@
+<automaton>
+	<states>
+		<state>['A', 'C', 'S']</state>
+		<state>['A', 'S']</state>
+		<state>['B', 'S']</state>
+		<state>['S']</state>
+	</states>
+	<inputAlphabet>
+		<symbol>0</symbol>
+		<symbol>1</symbol>
+	</inputAlphabet>
+	<transitions>
+		<transition>
+			<from>['A', 'C', 'S']</from>
+			<input>0</input>
+			<to>['A', 'S']</to>
+		</transition>
+		<transition>
+			<from>['A', 'C', 'S']</from>
+			<input>1</input>
+			<to>['B', 'S']</to>
+		</transition>
+		<transition>
+			<from>['A', 'S']</from>
+			<input>0</input>
+			<to>['A', 'S']</to>
+		</transition>
+		<transition>
+			<from>['A', 'S']</from>
+			<input>1</input>
+			<to>['B', 'S']</to>
+		</transition>
+		<transition>
+			<from>['B', 'S']</from>
+			<input>0</input>
+			<to>['A', 'C', 'S']</to>
+		</transition>
+		<transition>
+			<from>['B', 'S']</from>
+			<input>1</input>
+			<to>['S']</to>
+		</transition>
+		<transition>
+			<from>['S']</from>
+			<input>0</input>
+			<to>['A', 'S']</to>
+		</transition>
+		<transition>
+			<from>['S']</from>
+			<input>1</input>
+			<to>['S']</to>
+		</transition>
+	</transitions>
+	<initialStates>
+		<state>['S']</state>
+	</initialStates>
+	<finalStates>
+		<state>['A', 'C', 'S']</state>
+	</finalStates>
+</automaton>
diff --git a/makefile b/makefile
index 86e7d04447..d30be54225 100644
--- a/makefile
+++ b/makefile
@@ -12,7 +12,7 @@ $(SUBDIRS):
 copy:
 	rm -rf $(BINFOLDER)
 	mkdir $(BINFOLDER)
-	cp alib/bin/libalib.so $(BINFOLDER)
+	cp alib/lib/libalib.so $(BINFOLDER)
 	cp acat/bin/acat $(BINFOLDER)
 	cp aconvert/bin/aconvert $(BINFOLDER)
 	cp aconvert.dot/bin/aconvert.dot $(BINFOLDER)
@@ -20,7 +20,7 @@ copy:
 	cp aminimize/bin/aminimize $(BINFOLDER)
 
 install:
-	cp alib/bin/libalib.so $(LIBPATH)
+	cp alib/lib/libalib.so $(LIBPATH)
 	cp acat/bin/acat $(APPPATH)
 	cp aconvert/bin/aconvert $(APPPATH)
 	cp aconvert.dot/bin/aconvert.dot $(APPPATH)
-- 
GitLab