X-Git-Url: http://git.jankratochvil.net/?p=gnokii.git;a=blobdiff_plain;f=Makefile;h=1feaf9c7f1d3b3da91e399f42a4c5709822e7870;hp=cfef684cbf2df55d1b555977746869c94de382d6;hb=a363234939c6030f24d092e9d4d97ee40f50ce03;hpb=4ee1266711b695852ec88f06784fd84400cd70bb

diff --git a/Makefile b/Makefile
index cfef684..1feaf9c 100644
--- a/Makefile
+++ b/Makefile
@@ -18,17 +18,26 @@ include ${TOPDIR}/Makefile.global
 BIN_DIRS = gnokii
 
 ifndef WIN32
-BIN_DIRS += gnokiid utils
+BIN_DIRS += gnokiid
+BIN_DIRS += mgnetd
+BIN_DIRS += mgnetd/mg_demo_client
 endif
 
-DIRS =  common/phones \
-	common/links \
-	common/devices \
-	common/data \
-        common \
+DIRS =  common \
+        Docs \
 	$(BIN_DIRS)
 
-GTK_DIRS =  xgnokii
+#
+# For now gnokiid and utils only make sense on Unix like systems.
+# Some other stuff that makes only sense on Win32 platform.
+#
+
+ifndef WIN32
+DIRS +=	utils
+endif
+
+GTK_DIRS =  xgnokii \
+            xlogos
 
 PO_DIR   = 	po
 DOCS_DIR = 	Docs
@@ -47,6 +56,25 @@ all: $(DIRS)
 	fi
 	@echo "done"
 
+makelib:
+	@for dir in $(DIRS); do \
+	    if [ -e $$dir/Makefile ]; then \
+		$(MAKE) -C $$dir makelib; \
+	    fi; \
+	done
+	@if [ "x$(USE_NLS)" = xyes ]; then \
+		$(MAKE) -C $(PO_DIR) makelib; \
+	fi
+
+	@if [ "$(GTK_LIBS)" ]; then \
+		for dir in $(GTK_DIRS); do \
+		    if [ -e $$dir/Makefile ]; then \
+			$(MAKE) -C $$dir makelib; \
+		    fi; \
+		done \
+	fi
+	@echo "done"
+
 dummy:
 
 $(DIRS): dummy
@@ -90,8 +118,6 @@ distclean:	clean
 		packaging/Slackware/SlackBuild \
 		po/Makefile.in \
 		debian
-	$(RM) `$(FIND) . -name "*~"`
-	@echo "done"
 
 dep:
 	@for dir in $(DIRS); do \
@@ -109,7 +135,7 @@ dep:
 	fi
 	@echo "done"
 
-install: all
+install:
 	@for dir in $(DIRS); do \
 	    if [ -e $$dir/Makefile ]; then \
 		$(MAKE) -C $$dir install; \