Merge remote-tracking branch 'pwnymix/master'

* pwnymix/master: (25 commits)
  show description in list-short
  properly clamp values in Set{Balance,Volume}
  resolve the card choice as late as possible
  allow card lookup by index
  Cleanup manpage, reintroduce application commands section
  add manpage
  reorg usage output
  remove defunct enum
  implement -short variations of list verbs
  A dash of color...
  fix abort on set-profile after removing profile
  whitespace police
  remove string_to_device; PulseClient can do this now
  always defined behaviors for devices
  Derive the card from the targetted device
  ponymix: validate arg count before invoking function
  rename class Pulse to PulseClient
  makefile: CFLAGS -> CXXFLAGS
  eschew _unused_ attribute
  alias sane types to --device flags
  ...

Conflicts:
	Makefile
	ponymix.1

1 files changed, 21 insertions, 8 deletions

diff --git a/Makefile b/Makefile
index a6b89f2..b41b05c 100644
--- a/Makefile
+++ b/Makefile
@@ -1,15 +1,28 @@
-CC = gcc -std=gnu99
-CFLAGS := -Wall -Wextra -pedantic -O2 -g -D_REENTRANT $(CFLAGS)
-LDLIBS := -lpulse -lm
+CXX = g++ -std=c++11
 
-ponymix: ponymix.o
+base_CXXFLAGS = -Wall -Wextra -pedantic -O2 -g
+base_LIBS = -lm
+
+libpulse_CXXFLAGS = $(shell pkg-config --cflags libpulse)
+libpulse_LIBS = $(shell pkg-config --libs libpulse)
+
+CXXFLAGS := \
+	$(base_CXXFLAGS) \
+	$(libpulse_CXXFLAGS) \
+	$(CXXFLAGS)
+
+LDLIBS := \
+	$(base_LIBS) \
+	$(libpulse_LIBS)
+
+all: ponymix
+
+ponymix: ponymix.cc pulse.o
+pulse.o: pulse.cc pulse.h
 
 install: ponymix
 	install -Dm755 ponymix $(DESTDIR)/usr/bin/ponymix
 	install -Dm644 ponymix.1 $(DESTDIR)/usr/share/man/man1/ponymix.1
 
-check: ponymix
-	./runtests ./ponymix
-
 clean:
-	$(RM) ponymix ponymix.o
+	$(RM) ponymix pulse.o