Moved comm.h from head to global directory. Fixed compilation of logint. Removed...

diff --git a/Makefile.am b/Makefile.am
index 3c56338f2811aed538a3d4f6072d92c592bea773..e8624a57d75f34021ebcd16c0819cf5496bdb45f 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -21,81 +21,97 @@ bin_PROGRAMS = \
 
 BUILT_SOURCES = \
   src/graph/loggraph.moc \
-  src/net/lognet.moc \
+  src/net/lognet.moc.cpp \
   src/kernel/kernel.moc \
-  src/edit/editor.moc \
+  src/edit/editor.moc.cpp \
   src/lgconfig/lgconfig.moc \
-  src/preproc/prep.moc \
+  src/preproc/prep.moc.cpp \
   src/help/help.moc
-#  int/logint.moc 
 
-bin_loggraph_SOURCES = src/graph/loggraph.cpp
+bin_loggraph_SOURCES = src/graph/loggraph.cpp src/graph/loggraph.moc
 bin_loggraph_CPPFLAGS = $(bin_loggraph_CFLAGS)
 bin_loggraph_LDADD = $(bin_loggraph_LIBS)
-$(bin_loggraph_OBJECTS) : src/graph/loggraph.moc
 src/graph/loggraph.moc: 
        $(MOC) -i src/graph/loggraph.cpp -o src/graph/loggraph.moc
 
 clean-loggraph-extra:
-       rm -f src/graph/*.moc
+       rm -f src/graph/*.moc.cpp
 
-bin_lognet_SOURCES = src/net/lognet.cpp
+bin_lognet_SOURCES = src/net/lognet.cpp src/net/lognet.moc.cpp
 bin_lognet_CPPFLAGS = $(bin_lognet_CFLAGS)
 bin_lognet_LDADD = $(bin_lognet_LIBS)
-$(bin_lognet_OBJECTS) : src/net/lognet.moc
-src/net/lognet.moc:
-       $(MOC) -i src/net/lognet.cpp -o src/net/lognet.moc
+src/net/lognet.moc.cpp:
+       $(MOC) -i src/net/lognet.cpp -o src/net/lognet.moc.cpp
 
 clean-lognet-extra:
-       rm -f src/net/*.moc
+       rm -f src/net/*.moc.cpp
        
-bin_logker_SOURCES = src/kernel/kernel.cpp
+bin_logker_SOURCES = src/kernel/kernel.cpp src/kernel/kernel.moc
 bin_logker_CPPFLAGS = $(bin_logker_CFLAGS)
 bin_logker_LDADD = $(bin_logker_LIBS)
-$(bin_logker_OBJECTS) : src/kernel/kernel.moc
 src/kernel/kernel.moc:
        $(MOC) -i src/kernel/kernel.cpp -o src/kernel/kernel.moc
        
 clean-logker-extra:
        rm -f src/kernel/*.moc
        
-#int_logint_SOURCES = kernel/kernel.moc
+bin_logint_SOURCES = \
+  src/int/cint.c \
+  src/int/compact.c \
+  src/int/control.c \
+  src/int/util.c \
+  src/int/handler.c \
+  src/int/intdt.c \
+  src/int/memory.c \
+  src/int/object.c \
+  src/int/runsys.c \
+  src/int/standard.c \
+  src/int/execute.c \
+  src/int/fileio.c \
+  src/int/nonstand.c \
+  src/int/process.c \
+  src/int/procaddr.c \
+  src/int/queue.c \
+  src/int/rpcall.c \
+  src/int/typchk.c 
+
+# TODO: logint is compiled using gcc instead of g++, for some reason it losts -I./src/global directive
+#       force adding it.
+bin_logint_CPPFLAGS = $(bin_logint_CFLAGS) -DUNIX -DWORD_32BIT -DUSE_CLOCK -Dpascal= -DOBJECTADDR -DSYSV -I$(top_srcdir)/src/global -I/usr/include/qt3
+bin_logint_LDADD = $(bin_logint_LIBS) -lm -lqt-mt
+
+bin_logedit_SOURCES = src/edit/editor.cpp src/edit/editor.moc.cpp 
+bin_logedit_CPPFLAGS = $(bin_logedit_CFLAGS) 
+bin_logedit_LDADD = $(bin_logedit_LIBS)
 
+src/edit/editor.moc.cpp: src/edit/editor.h
+       $(MOC) src/edit/editor.h -o src/edit/editor.moc.cpp
 
-bin_logedit_SOURCES = src/edit/editor.moc
-bin_logedit_CPPFLAGS = $(bin_logedit_CFLAGS)
-bin_logedit_LDADD = $(bin_logedit_LIBS)
-$(bin_logedit_OBJECTS) : src/edit/editor.moc
-src/edit/editor.moc:
-       $(MOC) -i src/edit/editor.cpp -o src/edit/editor.moc
 
 clean-logedit-extra:
-       rm -f src/edit/*.moc
+       rm -f src/edit/*.moc.cpp
 
-bin_lgconfig_SOURCES = src/lgconfig/lgconfig.moc
+bin_lgconfig_SOURCES = src/lgconfig/lgconfig.cpp src/lgconfig/lgconfig.moc
 bin_lgconfig_CPPFLAGS = $(bin_lgconfig_CFLAGS)
 bin_lgconfig_LDADD = $(bin_lgconfig_LIBS)
-$(bin_lgconfig_OBJECTS) : src/lgconfig/lgconfig.moc
 src/lgconfig/lgconfig.moc:
        $(MOC) -i src/lgconfig/lgconfig.cpp -o src/lgconfig/lgconfig.moc
 
 clean-lgconfig-extra:
        rm -f src/lgconfig/*.moc
 
-bin_logcomp_SOURCES = src/preproc/prep.moc
-bin_logcomp_CPPFLAGS = $(preproc_logcomp_CFLAGS)
-bin_logcomp_LDADD = $(preproc_logcomp_LIBS)
-$(bin_logcomp_OBJECTS) : src/preproc/prep.moc
-src/preproc/prep.moc: 
-       $(MOC) -i src/preproc/prep.cpp -o src/preproc/prep.moc
+bin_logcomp_SOURCES = src/preproc/prep.cpp src/preproc/prep.moc.cpp
+bin_logcomp_CPPFLAGS = $(bin_logcomp_CFLAGS)
+bin_logcomp_LDADD = $(bin_logcomp_LIBS)
+src/preproc/prep.moc.cpp: src/preproc/prep.cpp 
+       $(MOC) src/preproc/prep.cpp -o src/preproc/prep.moc.cpp
 
 clean-logcomp-extra:
        rm -f src/preproc/*.moc
 
-bin_loghelp_SOURCES = src/help/help.moc
+bin_loghelp_SOURCES = src/help/help.cpp src/help/help.moc
 bin_loghelp_CPPFLAGS = $(bin_loghelp_CFLAGS)
 bin_loghelp_LDADD = $(bin_loghelp_LIBS)
-$(bin_loghelp_OBJECTS) : src/help/help.moc
 src/help/help.moc:
        $(MOC) -i src/help/help.cpp -o src/help/help.moc
 

diff --git a/configure.ac b/configure.ac
index 733381fea2ec606a5ce64029f57e9ed113c232dd..b1be6df265c1067f17f42ee25b6ebce1bdac2b1e 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -14,7 +14,7 @@ AC_CONFIG_FILES([Makefile])
 PKG_CHECK_MODULES([bin_loggraph], [qt-mt < 4.0])
 PKG_CHECK_MODULES([bin_lognet], [qt-mt < 4.0])
 PKG_CHECK_MODULES([bin_logker], [qt-mt < 4.0])
-#PKG_CHECK_MODULES([int_logint], [qt-mt < 4.0])
+#PKG_CHECK_MODULES([bin_logint], [qt-mt < 4.0])
 PKG_CHECK_MODULES([bin_logedit], [qt-mt < 4.0])
 PKG_CHECK_MODULES([bin_lgconfig], [qt-mt < 4.0])
 PKG_CHECK_MODULES([bin_logcomp], [qt-mt < 4.0])

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

diff --git a/src/graph/loggraph.cpp b/src/graph/loggraph.cpp
index bed6f5d1ebac6d113eea96c9aed36635cfc7a9be..c6c11a9ee0bd26e7c213d468c3ad83a03e601b7f 100644 (file)
--- a/src/graph/loggraph.cpp
+++ b/src/graph/loggraph.cpp
@@ -23,7 +23,7 @@
 #include <sys/stat.h>
 #include <netinet/in.h>
 #include "genint1.h"
-#include "../head/comm.h"
+#include "comm.h"
 #include "socu.h"
 #include <unistd.h>
 #include <qsocknot.h>

diff --git a/src/int/int.h b/src/int/int.h
index 3dee15f67e2f1d98de8a3da1de2d0b3d382aa605..1ccd8794b4a0c08f7f33d0f6a336e4ad72b56aad 100644 (file)
--- a/src/int/int.h
+++ b/src/int/int.h
@@ -1,4 +1,4 @@
-#include "../head/comm.h"
+#include "comm.h"
 
 #define MAXMARKER       MAXINTEGER  /* maximum special value of mark */
 #define MAXAPPT         MAXINTEGER  /* maximum appetite (easily extensible ?) */

diff --git a/src/kernel/kernel.cpp b/src/kernel/kernel.cpp
index e17b6e50d54f7a18f9887f42380ca4d3065e608e..ad259d30d4bccc7dc5abee72d449bd491d55f101 100644 (file)
--- a/src/kernel/kernel.cpp
+++ b/src/kernel/kernel.cpp
@@ -67,7 +67,7 @@
 #include <fcntl.h>
 
 #include "genint1.h"
-#include "../head/comm.h"
+#include "comm.h"
 #include "socu.h"
 #include <netinet/in.h>
 

diff --git a/src/net/lognet.cpp b/src/net/lognet.cpp
index 8a10bbe98ffc3f822e3c3666cb5adc05d7cf2d7d..dda6733d9a023de3faf72fb019c5e2fdcec3f8db 100644 (file)
--- a/src/net/lognet.cpp
+++ b/src/net/lognet.cpp
@@ -1,5 +1,5 @@
 #include "genint1.h"
-#include "../head/comm.h"
+#include "comm.h"
 
 #include <sys/socket.h>
 #include <sys/un.h>