Merge pull request #7 from eagletmt/linux

Support D-Bus secret service via libsecret

Makefile

@@ -1,14 +1,26 @@
-CFLAGS += -Wall -Wextra -ansi -pedantic -std=c99 -mmacosx-version-min=10.7
-LIBS = -ledit -ltermcap -framework Security -framework CoreFoundation
+UNAME = $(shell uname)
+CFLAGS += -Wall -Wextra -ansi -pedantic -std=c99
+ifeq ($(UNAME), Darwin)
+	CFLAGS += -mmacosx-version-min=10.7
+	LIBS = -ledit -ltermcap -framework Security -framework CoreFoundation
+	OBJS = envchain.o envchain_osx.o
+else
+	CFLAGS += `pkg-config --cflags libsecret-1`
+	LIBS = -lreadline `pkg-config --libs libsecret-1`
+	OBJS = envchain.o envchain_linux.o
+endif
 
 DESTDIR ?= /usr
 
 all: envchain
-envchain: envchain.c
-	$(CC) $(CFLAGS) $(LIBS) envchain.c -o envchain
+envchain: $(OBJS)
+	$(CC) $(LDCFLAGS) $(LIBS) -o envchain $(OBJS)
+
+%.o: %.c envchain.h
+	$(CC) -c $(CFLAGS) $(CPPFLAGS) -o $@ $<
 
 clean:
-	rm -f envchain
+	rm -f envchain $(OBJS)
 
 install: all
 	install -d $(DESTDIR)/./bin

README.md

@@ -1,4 +1,4 @@
-# envchain - set environment variables with OS X keychain
+# envchain - set environment variables with OS X keychain or D-Bus secret service
 
 ## What?