Author: coolo Date: Fri Nov 30 15:01:53 2007 New Revision: 42559 URL: http://svn.opensuse.org/viewcvs/yast?rev=42559&view=rev Log: remove automake support now that the spec file should be fixed - autodocs may be problematic, I don't know Removed: branches/tmp/coolo/qt4-port/acinclude.m4 branches/tmp/coolo/qt4-port/configure.in.in branches/tmp/coolo/qt4-port/doc/Makefile.am branches/tmp/coolo/qt4-port/doc/autodocs/Makefile.am branches/tmp/coolo/qt4-port/fonts/Makefile.am branches/tmp/coolo/qt4-port/src/Makefile.am branches/tmp/coolo/qt4-port/src/pkg/Makefile.am branches/tmp/coolo/qt4-port/src/pkg/icons/Makefile.am branches/tmp/coolo/qt4-port/testsuite/Makefile.am Modified: branches/tmp/coolo/qt4-port/Makefile.cvs branches/tmp/coolo/qt4-port/src/CMakeLists.txt Modified: branches/tmp/coolo/qt4-port/Makefile.cvs URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/coolo/qt4-port/Makefile.cvs?rev=42559&r1=42558&r2=42559&view=diff ============================================================================== --- branches/tmp/coolo/qt4-port/Makefile.cvs (original) +++ branches/tmp/coolo/qt4-port/Makefile.cvs Fri Nov 30 15:01:53 2007 @@ -6,18 +6,15 @@ PREFIX = /usr -configure: all - ./configure --prefix=$(PREFIX) --libdir=$(PREFIX)/$(LIB) - -all: - y2tool y2autoconf - y2tool y2automake - autoreconf --force --install +configure: + mkdir build ;\ + cd build ;\ + cmake -DCMAKE_INSTALL_PREFIX=$(PREFIX) -DLIB=$(LIB) .. install: configure - make - make install + cd build; \ + make && make install -reconf: all - ./config.status --recheck - ./config.status +reconf: + cd build ;\ + cmake rebuild_cache Modified: branches/tmp/coolo/qt4-port/src/CMakeLists.txt URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/coolo/qt4-port/src/CMakeLists.txt?rev=42559&r1=42558&r2=42559&view=diff ============================================================================== --- branches/tmp/coolo/qt4-port/src/CMakeLists.txt (original) +++ branches/tmp/coolo/qt4-port/src/CMakeLists.txt Fri Nov 30 15:01:53 2007 @@ -2,7 +2,6 @@ ADD_DEFINITIONS( -DY2LOG=\\\"QT4\\\" ${QT_DEFINITIONS} -#-DQT3_SUPPORT -DQT_LOCALEDIR=\\\"${CMAKE_INSTALL_PREFIX}/share/qt4/translations\\\" -DICONDIR=\\"${Y2QT_ICONDIR}\\" -DLOCALEDIR=\\\"${Y2QT_LOCALEDIR}\\\" -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org