Embed iniparser

Makefile

@@ -18,37 +18,35 @@
 #   You should have received a copy of the GNU General Public License
 #   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-SHELL = /bin/sh
-BINDIR = /usr/local/bin
+NAME = iouyap
 
-srcdir = .
+BINDIR = /usr/local/bin
 
 CC = gcc #-O3
-CDEBUG = -g -DDEBUG
-CFLAGS = $(CDEBUG) -Wall
+CFLAGS = -Wall
 
-LDLIBS = -liniparser -lpthread
-LDFLAGS =
+LDLIBS = -lpthread
 
 YACC = bison -y
 YFLAGS = -d
 
 LEX = flex
-LFLAGS =
 
-objects = netmap_parse.o netmap_scan.o netmap.o config.o iouyap.o
+SRCDIR = .,iniparser
+
+OBJECTS = netmap_parse.o netmap_scan.o netmap.o config.o iouyap.o iniparser/iniparser.o iniparser/dictionary.o
 
-all : iouyap
+$(OBJECTS) = iouyap.h netmap.h config.h iniparser/iniparser.h iniparser/dictionary.h
 
-iouyap : $(objects)
+all: $(NAME)
 
-$(objects) : iouyap.h netmap.h config.h
+$(NAME): $(OBJECTS)
 
 .PHONY : clean
 clean :
-	-rm iouyap y.tab.* *.o
+	rm -f iouyap y.tab.* *.o */*.o
 
-install : iouyap
+install : $(NAME)
 	chmod +x iouyap
 	sudo cp iouyap $(BINDIR)
 	sudo setcap cap_net_admin,cap_net_raw=ep iouyap

config.c

@@ -18,7 +18,7 @@
  *   along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <iniparser.h>
+#include "iniparser/iniparser.h"
 
 #include "config.h"
 

iniparser/LICENSE

@@ -0,0 +1,21 @@
+Copyright (c) 2000-2011 by Nicolas Devillard.
+MIT License
+
+Permission is hereby granted, free of charge, to any person obtaining a
+copy of this software and associated documentation files (the "Software"),
+to deal in the Software without restriction, including without limitation
+the rights to use, copy, modify, merge, publish, distribute, sublicense,
+and/or sell copies of the Software, and to permit persons to whom the
+Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+DEALINGS IN THE SOFTWARE.
+