Salome HOME
projects
/
tools
/
install.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Changing version from 5.1.0 to 5.1.1
[tools/install.git]
/
src
/
Makefile
diff --git
a/src/Makefile
b/src/Makefile
index b4dc32c1b718a7bf582849287318db95b57667af..abf01f1217a45f92ef5edebdf51d3b970acc155e 100644
(file)
--- a/
src/Makefile
+++ b/
src/Makefile
@@
-1,9
+1,9
@@
#############################################################################
# Makefile for building: ../bin/SALOME_InstallWizard
#############################################################################
# Makefile for building: ../bin/SALOME_InstallWizard
-# Generated by qmake (1.0
3a) on: Wed Mar 17 17:34:01 2004
+# Generated by qmake (1.0
7a) (Qt 3.3.8) on: Fri Nov 7 17:35:06 2008
# Project: SALOME_INSTALL.pro
# Template: app
# Project: SALOME_INSTALL.pro
# Template: app
-# Command: $(QMAKE) SALOME_INSTALL.pro
+# Command: $(QMAKE)
-o Makefile
SALOME_INSTALL.pro
#############################################################################
####### Compiler, tools and options
#############################################################################
####### Compiler, tools and options
@@
-12,14
+12,14
@@
CC = gcc
CXX = g++
LEX = flex
YACC = yacc
CXX = g++
LEX = flex
YACC = yacc
-CFLAGS = -pipe -W
all -W -I/usr/include/fontconfig -I/usr/include/Xft2 -O2 -march=i386 -mcpu=i686 -fno-use-cxa-atexit -fno-exceptions -DQT_NO_DEBUG
-CXXFLAGS = -pipe -W
all -W -I/usr/include/fontconfig -I/usr/include/Xft2 -O2 -march=i386 -mcpu=i686 -fno-use-cxa-atexit -fno-exceptions -DQT_NO_DEBUG
+CFLAGS = -pipe -W
no-deprecated -Wall -W -O2 -D_REENTRANT -DQT_NO_DEBUG -DQT_THREAD_SUPPORT
+CXXFLAGS = -pipe -W
no-deprecated -Wall -W -O2 -D_REENTRANT -DQT_NO_DEBUG -DQT_THREAD_SUPPORT
LEXFLAGS =
YACCFLAGS= -d
LEXFLAGS =
YACCFLAGS= -d
-INCPATH = -I
$(QTDIR)/include -I$(QTDIR)/mkspecs/default
+INCPATH = -I
/dn06/salome/vsr/static/qt-3.3.3/mkspecs/default -I. -I$(QTDIR)/include
LINK = g++
LINK = g++
-LFLAGS =
-LIBS = $(SUBLIBS)
-L$(QTDIR)/lib -L/usr/X11R6/lib -lqt -ldl -lXinerama -lSM -lqt-mt -lXext -lX11 -lm
+LFLAGS =
-Wl,-rpath,$(QTDIR)/lib
+LIBS = $(SUBLIBS)
-L$(QTDIR)/lib -L/usr/X11R6/lib -lqt-mt -L/usr/X11R6/lib -lXrender -lXinerama -lSM -lICE -ldl -lXext -lX11 -lm -lpthread
AR = ar cqs
RANLIB =
MOC = $(QTDIR)/bin/moc
AR = ar cqs
RANLIB =
MOC = $(QTDIR)/bin/moc
@@
-28,12
+28,16
@@
QMAKE = qmake
TAR = tar -cf
GZIP = gzip -9f
COPY = cp -f
TAR = tar -cf
GZIP = gzip -9f
COPY = cp -f
-COPY_FILE= $(COPY) -p
-COPY_DIR = $(COPY) -pR
+COPY_FILE= $(COPY)
+COPY_DIR = $(COPY) -r
+INSTALL_FILE= $(COPY_FILE)
+INSTALL_DIR = $(COPY_DIR)
DEL_FILE = rm -f
SYMLINK = ln -sf
DEL_DIR = rmdir
DEL_FILE = rm -f
SYMLINK = ln -sf
DEL_DIR = rmdir
-MOVE = mv
+MOVE = mv -f
+CHK_DIR_EXISTS= test -d
+MKDIR = mkdir -p
####### Output directory
####### Output directory
@@
-47,21
+51,24
@@
HEADERS = SALOME_InstallWizard.hxx \
SALOME_XmlHandler.hxx \
SALOME_HelpWindow.hxx \
icons.h \
SALOME_XmlHandler.hxx \
SALOME_HelpWindow.hxx \
icons.h \
- InstallWizard.h
+ InstallWizard.h \
+ globals.h
SOURCES = main.cxx \
SALOME_InstallWizard.cxx \
SALOME_ProductsView.cxx \
SALOME_ProgressView.cxx \
SALOME_XmlHandler.cxx \
SALOME_HelpWindow.cxx \
SOURCES = main.cxx \
SALOME_InstallWizard.cxx \
SALOME_ProductsView.cxx \
SALOME_ProgressView.cxx \
SALOME_XmlHandler.cxx \
SALOME_HelpWindow.cxx \
- InstallWizard.cpp
+ InstallWizard.cpp \
+ icons.cxx
OBJECTS = main.o \
SALOME_InstallWizard.o \
SALOME_ProductsView.o \
SALOME_ProgressView.o \
SALOME_XmlHandler.o \
SALOME_HelpWindow.o \
OBJECTS = main.o \
SALOME_InstallWizard.o \
SALOME_ProductsView.o \
SALOME_ProgressView.o \
SALOME_XmlHandler.o \
SALOME_HelpWindow.o \
- InstallWizard.o
+ InstallWizard.o \
+ icons.o
FORMS =
UICDECLS =
UICIMPLS =
FORMS =
UICDECLS =
UICIMPLS =
@@
-74,14
+81,14
@@
OBJMOC = moc_SALOME_InstallWizard.o \
moc_SALOME_HelpWindow.o \
moc_InstallWizard.o
DIST = SALOME_INSTALL.pro
moc_SALOME_HelpWindow.o \
moc_InstallWizard.o
DIST = SALOME_INSTALL.pro
-QMAKE_TARGET =
../bin/
SALOME_InstallWizard
-DESTDIR =
+QMAKE_TARGET = SALOME_InstallWizard
+DESTDIR =
../bin/
TARGET = ../bin/SALOME_InstallWizard
first: all
####### Implicit rules
TARGET = ../bin/SALOME_InstallWizard
first: all
####### Implicit rules
-.SUFFIXES: .c .cpp .cc .cxx .C
+.SUFFIXES: .c .
o .
cpp .cc .cxx .C
.cpp.o:
$(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
.cpp.o:
$(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
@@
-102,21
+109,23
@@
first: all
all: Makefile $(TARGET)
all: Makefile $(TARGET)
-$(TARGET): $(UICDECLS) $(OBJECTS) $(OBJMOC)
- $(LINK) $(LFLAGS) -o $(TARGET) $(OBJECTS) $(OBJMOC) $(LIBS)
+$(TARGET): $(UICDECLS) $(OBJECTS) $(OBJMOC)
+ test -d ../bin/ || mkdir -p ../bin/
+ $(LINK) $(LFLAGS) -o $(TARGET) $(OBJECTS) $(OBJMOC) $(OBJCOMP) $(LIBS)
mocables: $(SRCMOC)
mocables: $(SRCMOC)
+uicables: $(UICDECLS) $(UICIMPLS)
$(MOC):
$(MOC):
- ( cd $(QTDIR)/src/moc
;
$(MAKE) )
+ ( cd $(QTDIR)/src/moc
&&
$(MAKE) )
-Makefile: SALOME_INSTALL.pro
$(QTDIR)/mkspecs/default/qmake.conf
- $(QMAKE) SALOME_INSTALL.pro
+Makefile: SALOME_INSTALL.pro
/dn06/salome/vsr/static/qt-3.3.3/mkspecs/default/qmake.conf /dn06/salome/vsr/static/qt-3.3.3/lib/libqt-mt.prl
+ $(QMAKE)
-o Makefile
SALOME_INSTALL.pro
qmake:
qmake:
- @$(QMAKE) SALOME_INSTALL.pro
+ @$(QMAKE)
-o Makefile
SALOME_INSTALL.pro
dist:
dist:
- @mkdir -p
bin/SALOME_InstallWizard && $(COPY_FILE) --parents $(SOURCES) $(HEADERS) $(FORMS) $(DIST) bin/SALOME_InstallWizard/ && ( cd `dirname bin/SALOME_InstallWizard` && $(TAR) ../bin/SALOME_InstallWizard.tar ../bin/SALOME_InstallWizard && $(GZIP) ../bin/SALOME_InstallWizard.tar ) && $(MOVE) `dirname bin/SALOME_InstallWizard`/../bin/SALOME_InstallWizard.tar.gz . && $(DEL_DIR) bin
/SALOME_InstallWizard
+ @mkdir -p
.tmp/SALOME_InstallWizard && $(COPY_FILE) --parents $(SOURCES) $(HEADERS) $(FORMS) $(DIST) .tmp/SALOME_InstallWizard/ && ( cd `dirname .tmp/SALOME_InstallWizard` && $(TAR) SALOME_InstallWizard.tar SALOME_InstallWizard && $(GZIP) SALOME_InstallWizard.tar ) && $(MOVE) `dirname .tmp/SALOME_InstallWizard`/SALOME_InstallWizard.tar.gz . && $(DEL_FILE) -r .tmp
/SALOME_InstallWizard
mocclean:
-$(DEL_FILE) $(OBJMOC)
mocclean:
-$(DEL_FILE) $(OBJMOC)
@@
-124,25
+133,29
@@
mocclean:
uiclean:
uiclean:
+yaccclean:
+lexclean:
clean: mocclean
clean: mocclean
- -$(DEL_FILE) $(OBJECTS)
+ -$(DEL_FILE) $(OBJECTS)
-$(DEL_FILE) *~ core *.core
####### Sub-libraries
distclean: clean
-$(DEL_FILE) *~ core *.core
####### Sub-libraries
distclean: clean
- -$(DEL_FILE) $(TARGET) $(TARGET)
+ -$(DEL_FILE)
../bin/
$(TARGET) $(TARGET)
FORCE:
####### Compile
FORCE:
####### Compile
-main.o: main.cxx SALOME_InstallWizard.hxx \
+main.o: main.cxx globals.h \
+ SALOME_InstallWizard.hxx \
InstallWizard.h
InstallWizard.h
-SALOME_InstallWizard.o: SALOME_InstallWizard.cxx SALOME_InstallWizard.hxx \
+SALOME_InstallWizard.o: SALOME_InstallWizard.cxx globals.h \
+ SALOME_InstallWizard.hxx \
SALOME_ProductsView.hxx \
SALOME_ProgressView.hxx \
SALOME_XmlHandler.hxx \
SALOME_ProductsView.hxx \
SALOME_ProgressView.hxx \
SALOME_XmlHandler.hxx \
@@
-154,7
+167,8
@@
SALOME_ProductsView.o: SALOME_ProductsView.cxx SALOME_ProductsView.hxx
SALOME_ProgressView.o: SALOME_ProgressView.cxx SALOME_ProgressView.hxx
SALOME_ProgressView.o: SALOME_ProgressView.cxx SALOME_ProgressView.hxx
-SALOME_XmlHandler.o: SALOME_XmlHandler.cxx SALOME_XmlHandler.hxx \
+SALOME_XmlHandler.o: SALOME_XmlHandler.cxx globals.h \
+ SALOME_XmlHandler.hxx \
SALOME_ProductsView.hxx \
SALOME_InstallWizard.hxx \
InstallWizard.h
SALOME_ProductsView.hxx \
SALOME_InstallWizard.hxx \
InstallWizard.h
@@
-166,13
+180,15
@@
SALOME_HelpWindow.o: SALOME_HelpWindow.cxx SALOME_HelpWindow.hxx \
InstallWizard.o: InstallWizard.cpp InstallWizard.h
InstallWizard.o: InstallWizard.cpp InstallWizard.h
-moc_SALOME_InstallWizard.o: moc_SALOME_InstallWizard.cpp SALOME_InstallWizard.hxx InstallWizard.h
+icons.o: icons.cxx icons.h
+
+moc_SALOME_InstallWizard.o: moc_SALOME_InstallWizard.cpp SALOME_InstallWizard.hxx InstallWizard.h
-moc_SALOME_ProductsView.o: moc_SALOME_ProductsView.cpp SALOME_ProductsView.hxx
+moc_SALOME_ProductsView.o: moc_SALOME_ProductsView.cpp
SALOME_ProductsView.hxx
-moc_SALOME_HelpWindow.o: moc_SALOME_HelpWindow.cpp SALOME_HelpWindow.hxx
+moc_SALOME_HelpWindow.o: moc_SALOME_HelpWindow.cpp
SALOME_HelpWindow.hxx
-moc_InstallWizard.o: moc_InstallWizard.cpp InstallWizard.h
+moc_InstallWizard.o: moc_InstallWizard.cpp
InstallWizard.h
moc_SALOME_InstallWizard.cpp: $(MOC) SALOME_InstallWizard.hxx
$(MOC) SALOME_InstallWizard.hxx -o moc_SALOME_InstallWizard.cpp
moc_SALOME_InstallWizard.cpp: $(MOC) SALOME_InstallWizard.hxx
$(MOC) SALOME_InstallWizard.hxx -o moc_SALOME_InstallWizard.cpp
@@
-188,7
+204,7
@@
moc_InstallWizard.cpp: $(MOC) InstallWizard.h
####### Install
####### Install
-install:
all
+install:
-uninstall:
+uninstall: