From cbb7d35b9fefe2357b5c6f72f8c29023806e3898 Mon Sep 17 00:00:00 2001 From: Victor Igumnov Date: Tue, 22 May 2018 10:52:34 -0700 Subject: [PATCH] Update the readme and implicitly git init the submodules if the adium directory does not exists --- Makefile | 1 + README.md | 11 +++-------- slack-libpurple | 2 +- 3 files changed, 5 insertions(+), 9 deletions(-) diff --git a/Makefile b/Makefile index fc2e705..3728db4 100644 --- a/Makefile +++ b/Makefile @@ -4,6 +4,7 @@ init: git submodule update --init compile: + if [ ! -d "adium" ]; then git submodule update --init; cd adium; make; cd ../; slack-libpurple; make; cd ../; fi xcodebuild -configuration Release -project "slack4adium.xcodeproj" clean: diff --git a/README.md b/README.md index 4b50e5e..b3959c6 100644 --- a/README.md +++ b/README.md @@ -15,15 +15,10 @@ Thanks ### How to build yourself -1. Checkout this git repository and init submodules +1. Checkout this git repository `git clone https://github.com/victori/slack4adium.git` - `git submodule update --init` -2. Compile Adium: +2. Compile the Adium plugin: - `cd adium; make` - -3. Compile the plugin: - - `xcodebuild -configuration Release -project "slack4adium.xcodeproj"` + `make` diff --git a/slack-libpurple b/slack-libpurple index 92d2aa1..9c04560 160000 --- a/slack-libpurple +++ b/slack-libpurple @@ -1 +1 @@ -Subproject commit 92d2aa1679d7c825a812ebcdb37997ba4ea81467 +Subproject commit 9c045602ca3ed72c1c25aeacc66ea19fc39ded74