From edada96bf8d3a72a734e2ad4b3a48d759df3df48 Mon Sep 17 00:00:00 2001 From: dockes Date: Thu, 24 May 2007 07:47:42 +0000 Subject: [PATCH] make uifrom3 a makefile --- src/configure | 2 +- src/configure.ac | 2 +- src/qt4gui/uifrom3 | 36 ++++++++++++++++++++++++++---------- 3 files changed, 28 insertions(+), 12 deletions(-) diff --git a/src/configure b/src/configure index c37cfce2..5e8982be 100755 --- a/src/configure +++ b/src/configure @@ -2815,7 +2815,7 @@ fi cd $QTGUI # We just want a .pro file: no problem with unsubstituted variables at # this point. -test -f uifrom3 && sh uifrom3 +test -f uifrom3 && make -f uifrom3 test -f recoll.pro && chmod +w recoll.pro cp recoll.pro.in recoll.pro ${QMAKE} recoll.pro diff --git a/src/configure.ac b/src/configure.ac index 4de745bf..eaa4eb39 100644 --- a/src/configure.ac +++ b/src/configure.ac @@ -218,7 +218,7 @@ fi cd $QTGUI # We just want a .pro file: no problem with unsubstituted variables at # this point. -test -f uifrom3 && sh uifrom3 +test -f uifrom3 && make -f uifrom3 test -f recoll.pro && chmod +w recoll.pro cp recoll.pro.in recoll.pro ${QMAKE} recoll.pro diff --git a/src/qt4gui/uifrom3 b/src/qt4gui/uifrom3 index 9e91aab0..248f06b0 100644 --- a/src/qt4gui/uifrom3 +++ b/src/qt4gui/uifrom3 @@ -1,13 +1,29 @@ -#!/bin/sh - -# Prepare the qt4 gui directory for compilation. This is called by "configure" - +# Makefile to prepare the qt4 gui directory for compilation. This is called +# by "configure" # Convert the uic files from qt3 to qt4. -for i in ../qtgui/*.ui ; do - echo converting $i - uic3 -convert $i > ../qt4gui/`basename $i` -done + +all: always advsearch.ui preview.ui rclmain.ui sort.ui spell.ui \ + ssearchb.ui uiprefs.ui viewaction.ui + + +advsearch.ui : ../qtgui/advsearch.ui + uic3 -convert ../qtgui/advsearch.ui > advsearch.ui +preview.ui : ../qtgui/preview.ui + uic3 -convert ../qtgui/preview.ui > preview.ui +rclmain.ui : ../qtgui/rclmain.ui + uic3 -convert ../qtgui/rclmain.ui > rclmain.ui +sort.ui : ../qtgui/sort.ui + uic3 -convert ../qtgui/sort.ui > sort.ui +spell.ui : ../qtgui/spell.ui + uic3 -convert ../qtgui/spell.ui > spell.ui +ssearchb.ui : ../qtgui/ssearchb.ui + uic3 -convert ../qtgui/ssearchb.ui > ssearchb.ui +uiprefs.ui : ../qtgui/uiprefs.ui + uic3 -convert ../qtgui/uiprefs.ui > uiprefs.ui +viewaction.ui: ../qtgui/viewaction.ui + uic3 -convert ../qtgui/viewaction.ui> viewaction.ui # Link the images -rm -f images -ln -s ../qtgui/images . +always: + rm -f images + ln -s ../qtgui/images .