X-Git-Url: https://git.dlugolecki.net.pl/?a=blobdiff_plain;f=Makefile.am;h=e8624a57d75f34021ebcd16c0819cf5496bdb45f;hb=refs%2Fheads%2Fvlp-12;hp=cd1268db1b8f943a15a4c011f98659567567f574;hpb=7a277153cc72eed9f152af09f22e680db3ec6563;p=vlp.git

diff --git a/Makefile.am b/Makefile.am
index cd1268d..e8624a5 100644
--- 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
 
 
@@ -20,86 +21,102 @@ 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 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 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 src/kernel/*.moc
+	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 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 src/lgconfig/*.moc
+	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 src/preproc/*.moc
+	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
 
 clean-loghelp-extra:
-	rm src/help/*.moc
+	rm -f src/help/*.moc
 
 CLEANFILES = \
   %.moc \