Port most of the code to the Qt4

[vlp.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 01ea3163d962e278c6e60795b222e2412ddd61fa..c1005c7bf84d7036f4239731145d8f0deef67229 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -5,8 +5,8 @@ MOC = ${MOCDIR}/${MOCNAME}
 
 #AM_CXXFLAGS= -Wall -pedantic -Wextra -fno-strength-reduce
 #AM_CXXFLAGS = -m32
-AM_CXXFLAGS = -I$(top_srcdir)/src/global
-AM_LDFLAGS= -fPIC
+AM_CXXFLAGS = -I$(top_srcdir)/src/global -I${QTDIR}/include/qt4 -pedantic -Wall -Wextra -DQT3_SUPPORT 
+AM_LDFLAGS= -fPIC -L$(QTDIR)/lib -lQtCore -lQtGui -lQt3Support
 
 EXTRA_DIST = \
        doc/examples \
@@ -18,20 +18,21 @@ EXTRA_DIST = \
        doc/CodingStyle \
        doc/vlp.cfg.sample
 
+#   bin/loggraph 
 bin_PROGRAMS = \
-  bin/loggraph \
   bin/lognet \
   bin/logker \
   bin/logint \
   bin/logedit \
   bin/lgconfig \
-  bin/logcomp \
-  bin/loghelp
+  bin/logcomp
+#   \
+#   bin/loghelp
 
 BUILT_SOURCES = \
   src/graph/loggraph.moc \
   src/net/lognet.moc.cpp \
-  src/kernel/kernel.moc \
+  src/kernel/kernel.moc.cpp \
   src/edit/editor.moc.cpp \
   src/lgconfig/lgconfig.moc \
   src/preproc/prep.moc.cpp \
@@ -50,7 +51,7 @@ clean-loggraph-extra:
 
 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_LDADD = $(bin_lognet_LIBS) -lconfig++
 bin_lognetdir = src/net
 bin_lognet_HEADERS = \
        src/net/soct.h
@@ -62,11 +63,15 @@ clean-lognet-extra:
        rm -f bin/modules/lognet
        rm -f bin/lognet
        
-bin_logker_SOURCES = src/kernel/kernel.cpp src/kernel/kernel.moc
+bin_logker_SOURCES = src/kernel/kernel.cpp src/kernel/kernel.moc.cpp
 bin_logker_CPPFLAGS = $(bin_logker_CFLAGS)
 bin_logker_LDADD = $(bin_logker_LIBS)
-src/kernel/kernel.moc:
-       $(MOC) -i src/kernel/kernel.cpp -o src/kernel/kernel.moc
+bin_logkerdir = src/kernel
+bin_logker_HEADERS = \
+       src/kernel/kernel.h
+src/kernel/kernel.moc.cpp: src/kernel/kernel.h
+       moc-qt4 src/kernel/kernel.h -o src/kernel/kernel.moc.cpp
+#      $(MOC) -i src/kernel/kernel.cpp -o src/kernel/kernel.moc
        
 clean-logker-extra:
        rm -f src/kernel/*.moc
@@ -95,7 +100,8 @@ bin_logint_SOURCES = \
 # 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_logint_LDADD = $(bin_logint_LIBS) -lm
+# -lqt-mt
 bin_logintdir = src/int
 bin_logint_HEADERS = \
        src/int/genint.h \
@@ -132,7 +138,7 @@ clean-logedit-extra:
 
 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_LDADD = $(bin_lgconfig_LIBS) -lconfig++
 src/lgconfig/lgconfig.moc:
        $(MOC) -i src/lgconfig/lgconfig.cpp -o src/lgconfig/lgconfig.moc