diff --git a/Makefile.cvs b/Makefile.cvs index 77de123ec903bcef25f8f6181b89f7bd454ecaa9..2bbae58b86ffd21ea5c1d3f4e88174f18fd26cf2 100644 --- a/Makefile.cvs +++ b/Makefile.cvs @@ -17,5 +17,7 @@ deps/%: deps/%.tar.gz cd deps/ && \ tar zxvf $*.tar.gz +qt: + cd src/gui/qt && qmake -all: autotools +all: autotools qt diff --git a/configure.ac b/configure.ac index 28bf35d18bed1e70e2674320d40e110035e8dc1c..7445528caf372624eda2b5ff76570c85713431b4 100644 --- a/configure.ac +++ b/configure.ac @@ -203,6 +203,7 @@ export CPPFLAGS echo $LDFLAGS echo $CPPFLAGS +AC_CONFIG_SUBDIRS(src/gui/qt) dnl AC_CONFIG_FILES( AC_OUTPUT( diff --git a/src/gui/Makefile.am b/src/gui/Makefile.am index 29e071920f3943818419263928656a74178fd12b..764fe9633a25d6136531b963362069c21eb3022f 100644 --- a/src/gui/Makefile.am +++ b/src/gui/Makefile.am @@ -1,6 +1,11 @@ serverdir = server serverlib = server/libsflphoneguiserver.la +libexec_PROGRAMS = qt/sflphoned + +qt/sflphoned: + cd qt && make + SUBDIRS = $(serverdir) noinst_LTLIBRARIES = libguiframework.la diff --git a/src/gui/qt/configure.gnu b/src/gui/qt/configure.gnu new file mode 100755 index 0000000000000000000000000000000000000000..c25aceb3e3fbd4e7ed5718d18e364ed51eebc6c7 --- /dev/null +++ b/src/gui/qt/configure.gnu @@ -0,0 +1,2 @@ +qmake +