More GNUmakefile cleanups.

With the normalization of magimail's Makefile,
we can further simplify this logic.

Integrate the WWW logic into GNUmakefile.common.

Remove the custom `Makefile.sunos` files: just
use a conditional in the Makefile.

Signed-off-by: Dan Cross <patchdev@fat-dragon.org>

utils/magichat/GNUmakefile

@@ -3,6 +3,11 @@ CC=cc
 DEPS = main.c
 
 OBJ = main.o
+
+OS = $(shell uname -s)
+ifeq ($(OS), SunOS)
+	EXTRA_LIBS = -lsocket
+endif
 %.o: %.c $(DEPS)
 	$(CC) -c -o $@ $< $(CFLAGS)
 
@@ -14,7 +19,7 @@ $(JSMN):
 	cd ../../deps/jsmn/ && $(MAKE)
 
 magichat: $(OBJ) $(JSMN)
-	$(CC) -o magichat -o $@ $^ $(CFLAGS) $(LDFLAGS) 
+	$(CC) -o magichat -o $@ $^ $(LDFLAGS) $(EXTRA_LIBS)
 
 .PHONY: clean
 

utils/magichat/Makefile.sunos

@@ -1,22 +0,0 @@
-CC=cc
-
-DEPS = main.c
-
-OBJ = main.o
-%.o: %.c $(DEPS)
-	$(CC) -c -o $@ $< $(CFLAGS)
-
-JSMN = ../../deps/jsmn/libjsmn.a
-
-all: magichat
-
-$(JSMN):
-	cd ../../deps/jsmn/ && $(MAKE)
-
-magichat: $(OBJ) $(JSMN)
-	$(CC) -o magichat -o $@ $^ $(CFLAGS) $(LDFLAGS) -lsocket
-
-.PHONY: clean
-
-clean:
-	rm -f $(OBJ) magichat

utils/magiedit/GNUmakefile

@@ -1,7 +1,12 @@
 CC=cc
 CFLAGS=-I../../deps/odoors/
 DEPS = main.c
-ODOORS = ../../deps/odoors/libs-`uname -s`/libODoors.a
+OS = $(shell uname -s)
+ODOORS = ../../deps/odoors/libs-${OS}/libODoors.a
+
+ifeq ($(OS), SunOS)
+	EXTRA_LIBS = -lsocket
+endif
 
 OBJ = main.o
 
@@ -14,7 +19,7 @@ ${ODOORS}:
 	$(CC) -c -o $@ $< $(CFLAGS)
 
 magiedit: $(OBJ) $(ODOORS)
-	$(CC) -o magiedit -o $@ $^ $(CFLAGS) $(ODOORS)
+	$(CC) -o magiedit -o $@ $^ $(CFLAGS) $(ODOORS) $(EXTRA_LIBS)
 
 .PHONY: clean
 

utils/magiedit/Makefile.sunos

@@ -1,22 +0,0 @@
-CC=cc
-CFLAGS=-I../../deps/odoors/
-DEPS = main.c
-ODOORS = ../../deps/odoors/libs-`uname -s`/libODoors.a
-
-OBJ = main.o
-
-all: magiedit
-
-${ODOORS}:
-	cd ../../deps/odoors && $(MAKE) MAKEFLAGS=
-
-%.o: %.c $(DEPS)
-	$(CC) -c -o $@ $< $(CFLAGS)
-
-magiedit: $(OBJ) $(ODOORS)
-	$(CC) -o magiedit -o $@ $^ $(CFLAGS) $(ODOORS) -lsocket
-
-.PHONY: clean
-
-clean:
-	rm -f $(OBJ) magiedit