From e408b9eb3e6ba9f07ef0a83624d30248d98e5217 Mon Sep 17 00:00:00 2001 From: thebsdbox Date: Mon, 6 Mar 2017 09:35:20 +0000 Subject: [PATCH] Fixed Makefile to build ./infrakit-instance-oneview Can be built with either build_plugin.sh or the Makefile --- .gitignore | 17 +++++++++++++++++ Makefile | 30 ++++++++++++++++++++++-------- 2 files changed, 39 insertions(+), 8 deletions(-) create mode 100644 .gitignore diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..78294be --- /dev/null +++ b/.gitignore @@ -0,0 +1,17 @@ + +*.plist + +instance-infrakit-oneview/ + +lib/ + +instance-infrakit-oneview/instance-infrakit-oneview.xcodeproj/ + + +instance-infrakit-oneview/instance-infrakit-oneview.xcodeproj/project.pbxproj + +headers/jansson_config.h + +headers/jansson.h + +instance-infrakit-oneview/instance-infrakit-oneview.xcodeproj/project.pbxproj diff --git a/Makefile b/Makefile index af6ca0f..e1a462c 100644 --- a/Makefile +++ b/Makefile @@ -1,7 +1,22 @@ -TARGET = instance-infrakit-oneview -LIBS = -lcurl ljansson +TARGET = infrakit-instance-oneview +LIBS = -ljansson -lcurl +LIBPATH = -L./lib/ CC = gcc -CFLAGS = -g -Wall +CFLAGS = -std=gnu99 -Wall -o3 -s + +SRC = src/oneviewHTTP.c \ + src/oneviewHTTPD.c \ + src/oneviewUtils.c \ + src/oneviewQuery.c \ + src/oneviewJSONParse.c \ + src/oneviewInfraKitPlugin.c \ + src/oneviewInfraKitInstance.c \ + src/oneviewInfraKitState.c \ + src/oneviewInfraKitConsole.c \ + infrakit-instance-oneview.c + +HEADERS= -I./headers/ + .PHONY: default all clean @@ -9,16 +24,15 @@ default: $(TARGET) all: default OBJECTS = $(patsubst ./src/%.c, %.o, $(./src/wildcard *.c)) -HEADERS = $(wildcard ./headers/*.h) %.o: %.c $(HEADERS) - $(CC) $(CFLAGS) -c $< -o $@ + $(CC) $(CFLAGS) -c $< -o $@ .PRECIOUS: $(TARGET) $(OBJECTS) $(TARGET): $(OBJECTS) - $(CC) $(OBJECTS) -Wall $(LIBS) -o $@ + $(CC) $(HEADERS) $(SRC) $(CFLAGS) $(LIBPATH) $(LIBS) -o $@ clean: - -rm -f *.o - -rm -f $(TARGET) + -rm -f *.o + -rm -f $(TARGET)