Found in "gnokii-working" directory, some November-patches version

[gnokii.git] / Makefile

diff --git a/Makefile b/Makefile
index 1feaf9c..f43d66d 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -17,27 +17,20 @@ include ${TOPDIR}/Makefile.global
 
 BIN_DIRS = gnokii
 
+BIN_DIRS += smsd
+
 ifndef WIN32
-BIN_DIRS += gnokiid
-BIN_DIRS += mgnetd
-BIN_DIRS += mgnetd/mg_demo_client
+#BIN_DIRS += gnokiid utils
 endif
 
-DIRS =  common \
-        Docs \
+DIRS =  common/phones \
+       common/links \
+       common/devices \
+        common \
        $(BIN_DIRS)
+#      common/data \
 
-#
-# 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
+GTK_DIRS =  xgnokii
 
 PO_DIR   =     po
 DOCS_DIR =     Docs
@@ -56,25 +49,6 @@ 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
@@ -115,9 +89,10 @@ distclean:  clean
                include/config.h \
                include/config.h.in \
                packaging/RedHat/gnokii.spec \
-               packaging/Slackware/SlackBuild \
                po/Makefile.in \
                debian
+       $(RM) `$(FIND) . -name "*~"`
+       @echo "done"
 
 dep:
        @for dir in $(DIRS); do \
@@ -135,7 +110,7 @@ dep:
        fi
        @echo "done"
 
-install:
+install: all
        @for dir in $(DIRS); do \
            if [ -e $$dir/Makefile ]; then \
                $(MAKE) -C $$dir install; \