From a2ae2e2de1538edb89b30cc811e5583248859bb2 Mon Sep 17 00:00:00 2001 From: dos-reis Date: Sun, 1 May 2011 17:23:26 +0000 Subject: more cleanups --- src/Makefile.am | 8 +++++++- src/Makefile.in | 6 +++++- src/gui/gui.pro.in | 27 +++++++++++++++++++++++++++ 3 files changed, 39 insertions(+), 2 deletions(-) create mode 100644 src/gui/gui.pro.in (limited to 'src') diff --git a/src/Makefile.am b/src/Makefile.am index b56fa7e1..89c0d3e7 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -52,10 +52,13 @@ if OA_BUILD_GRAPHICS OA_GRAPHICS_TARGETS = all-graph endif +if OA_BUILD_GUI +OA_GRAPHICS_TARGETS = all-gui +endif all-local: all-src -.PHONY: all-src +.PHONY: all-src $(OA_GRAPHICS_TARGETS) all-src: all-lib all-utils all-driver all-lisp all-boot \ all-interpsys all-algebra all-axiomsys all-share \ all-asq all-input all-doc $(OA_SMAN_TARGETS) $(OA_GRAPHICS_TARGETS) @@ -85,6 +88,9 @@ all-clef: all-lib all-sman: all-lib all-driver cd sman && $(MAKE) $(AM_MAKEFLAGS) $@ +all-gui: all-driver + cd gui && $(MAKE) $(AM_MAKEFLAGS) $@ + all-hyper: all-lib cd hyper && $(MAKE) $(AM_MAKEFLAGS) $@ diff --git a/src/Makefile.in b/src/Makefile.in index 50815c9c..d5c7415d 100644 --- a/src/Makefile.in +++ b/src/Makefile.in @@ -306,6 +306,7 @@ subdirs = \ oa_targetdir = $(top_builddir)/$(target) @OA_BUILD_SMAN_TRUE@OA_SMAN_TARGETS = all-sman all-clef @OA_BUILD_GRAPHICS_TRUE@OA_GRAPHICS_TARGETS = all-graph +@OA_BUILD_GUI_TRUE@OA_GRAPHICS_TARGETS = all-gui all: all-recursive .SUFFIXES: @@ -655,7 +656,7 @@ uninstall-am: all-local: all-src -.PHONY: all-src +.PHONY: all-src $(OA_GRAPHICS_TARGETS) all-src: all-lib all-utils all-driver all-lisp all-boot \ all-interpsys all-algebra all-axiomsys all-share \ all-asq all-input all-doc $(OA_SMAN_TARGETS) $(OA_GRAPHICS_TARGETS) @@ -685,6 +686,9 @@ all-clef: all-lib all-sman: all-lib all-driver cd sman && $(MAKE) $(AM_MAKEFLAGS) $@ +all-gui: all-driver + cd gui && $(MAKE) $(AM_MAKEFLAGS) $@ + all-hyper: all-lib cd hyper && $(MAKE) $(AM_MAKEFLAGS) $@ diff --git a/src/gui/gui.pro.in b/src/gui/gui.pro.in new file mode 100644 index 00000000..dfbe0fc3 --- /dev/null +++ b/src/gui/gui.pro.in @@ -0,0 +1,27 @@ +## Copyright (C) 2011 Gabriel Dos Reis +## Autoconf template file for the benefit of QMake +## Written by Gabriel Dos Reis. + +OA_INC = +OA_LIB = + +TEMPLATE = app +TARGET = gui + +## Tell QT that sources are not in the build directory +VPATH += @srcdir@ + +## Our headers +HEADERS += main-window.h +INCLUDEPATH += . $$OA_INC +DEPENDPATH += . + +## Source files +SOURCES += main-window.C main.C + +## Additional support libraries +LIBS += $$OA_LIB + +## C++ compiler +#QMAKE_CXX = @CXX@ +#QMAKE_CXXFLAGS += @CXXFLAGS@ -- cgit v1.2.3