Moved socu.h to the global directory. Removed all other socu.h files. Added to Makefi...

Added -f to the clean hook so there will be no problems with cleaning non-existing files.

diff --git a/Makefile.am b/Makefile.am
index cd1268db1b8f943a15a4c011f98659567567f574..3c56338f2811aed538a3d4f6072d92c592bea773 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -5,6 +5,7 @@ MOC = ${MOCDIR}/${MOCNAME}
 
 #AM_CXXFLAGS= -Wall -pedantic -Wextra -fno-strength-reduce
 #AM_CXXFLAGS = -m32
+AM_CXXFLAGS = -I$(top_srcdir)/src/global
 AM_LDFLAGS= -fPIC
 
 
@@ -36,7 +37,7 @@ src/graph/loggraph.moc:
        $(MOC) -i src/graph/loggraph.cpp -o src/graph/loggraph.moc
 
 clean-loggraph-extra:
-       rm src/graph/*.moc
+       rm -f src/graph/*.moc
 
 bin_lognet_SOURCES = src/net/lognet.cpp
 bin_lognet_CPPFLAGS = $(bin_lognet_CFLAGS)
@@ -46,7 +47,7 @@ src/net/lognet.moc:
        $(MOC) -i src/net/lognet.cpp -o src/net/lognet.moc
 
 clean-lognet-extra:
-       rm src/net/*.moc
+       rm -f src/net/*.moc
        
 bin_logker_SOURCES = src/kernel/kernel.cpp
 bin_logker_CPPFLAGS = $(bin_logker_CFLAGS)
@@ -56,7 +57,7 @@ src/kernel/kernel.moc:
        $(MOC) -i src/kernel/kernel.cpp -o src/kernel/kernel.moc
        
 clean-logker-extra:
-       rm src/kernel/*.moc
+       rm -f src/kernel/*.moc
        
 #int_logint_SOURCES = kernel/kernel.moc
 
@@ -69,7 +70,7 @@ src/edit/editor.moc:
        $(MOC) -i src/edit/editor.cpp -o src/edit/editor.moc
 
 clean-logedit-extra:
-       rm src/edit/*.moc
+       rm -f src/edit/*.moc
 
 bin_lgconfig_SOURCES = src/lgconfig/lgconfig.moc
 bin_lgconfig_CPPFLAGS = $(bin_lgconfig_CFLAGS)
@@ -79,7 +80,7 @@ src/lgconfig/lgconfig.moc:
        $(MOC) -i src/lgconfig/lgconfig.cpp -o src/lgconfig/lgconfig.moc
 
 clean-lgconfig-extra:
-       rm src/lgconfig/*.moc
+       rm -f src/lgconfig/*.moc
 
 bin_logcomp_SOURCES = src/preproc/prep.moc
 bin_logcomp_CPPFLAGS = $(preproc_logcomp_CFLAGS)
@@ -89,7 +90,7 @@ src/preproc/prep.moc:
        $(MOC) -i src/preproc/prep.cpp -o src/preproc/prep.moc
 
 clean-logcomp-extra:
-       rm src/preproc/*.moc
+       rm -f src/preproc/*.moc
 
 bin_loghelp_SOURCES = src/help/help.moc
 bin_loghelp_CPPFLAGS = $(bin_loghelp_CFLAGS)
@@ -99,7 +100,7 @@ src/help/help.moc:
        $(MOC) -i src/help/help.cpp -o src/help/help.moc
 
 clean-loghelp-extra:
-       rm src/help/*.moc
+       rm -f src/help/*.moc
 
 CLEANFILES = \
   %.moc \

diff --git a/src/graph/socu.h b/src/global/socu.h
similarity index 100%
rename from src/graph/socu.h
rename to src/global/socu.h

diff --git a/src/int/socu.h b/src/int/socu.h
deleted file mode 100644 (file)
index 0ed2797..0000000
--- a/src/int/socu.h
+++ /dev/null
@@ -1,4 +0,0 @@
-#include <sys/types.h>
-#include <sys/socket.h>
-#include <sys/un.h>
-#include <errno.h>

diff --git a/src/kernel/socu.h b/src/kernel/socu.h
deleted file mode 100644 (file)
index 0ed2797..0000000
--- a/src/kernel/socu.h
+++ /dev/null
@@ -1,4 +0,0 @@
-#include <sys/types.h>
-#include <sys/socket.h>
-#include <sys/un.h>
-#include <errno.h>

diff --git a/src/net/socu.h b/src/net/socu.h
deleted file mode 100644 (file)
index 0ed2797..0000000
--- a/src/net/socu.h
+++ /dev/null
@@ -1,4 +0,0 @@
-#include <sys/types.h>
-#include <sys/socket.h>
-#include <sys/un.h>
-#include <errno.h>