Salome HOME
projects
/
tools
/
install.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
c93bf09
)
Fix previous wrong integration
V_3_2_4
author
vsr
<vsr@opencascade.com>
Mon, 22 Jan 2007 10:00:12 +0000
(10:00 +0000)
committer
vsr
<vsr@opencascade.com>
Mon, 22 Jan 2007 10:00:12 +0000
(10:00 +0000)
src/Makefile
patch
|
blob
|
history
diff --git
a/src/Makefile
b/src/Makefile
index 8919ce9549de87f221ffb65161f7c6efb31aa821..078d0b87b8fe1e5d036b79e99e21979d85685bca 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
7a) (Qt 3.3.3) on: Mon Dec 25 16:52:2
0 2006
+# Generated by qmake (1.0
3a) on: Tue Mar 7 14:46:5
0 2006
# Project: SALOME_INSTALL.pro
# Template: app
# Project: SALOME_INSTALL.pro
# Template: app
-# Command: $(QMAKE)
-o Makefile
SALOME_INSTALL.pro
+# Command: $(QMAKE) 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 -Wno-deprecated -Wall -W -O2 -
fomit-frame-pointer -pipe -march=i586 -mtune=pentiumpro -D_REENTRANT -DQT_NO_DEBUG -DQT_THREAD_SUPPORT -DQT_SHARED
-CXXFLAGS = -pipe -Wno-deprecated -Wall -W -O2 -
fomit-frame-pointer -pipe -march=i586 -mtune=pentiumpro -D_REENTRANT -DQT_NO_DEBUG -DQT_THREAD_SUPPORT -DQT_SHARED
+CFLAGS = -pipe -Wno-deprecated -Wall -W -O2 -
D_REENTRANT -DQT_NO_DEBUG -DQT_THREAD_SUPPORT
+CXXFLAGS = -pipe -Wno-deprecated -Wall -W -O2 -
D_REENTRANT -DQT_NO_DEBUG -DQT_THREAD_SUPPORT
LEXFLAGS =
YACCFLAGS= -d
LEXFLAGS =
YACCFLAGS= -d
-INCPATH = -I
/usr/lib/qt3/mkspecs/default -I. -I$(QTDIR)/include
+INCPATH = -I
$(QTDIR)/include -I$(QTDIR)/mkspecs/default
LINK = g++
LFLAGS =
LINK = g++
LFLAGS =
-LIBS = $(SUBLIBS)
-L$(QTDIR)/lib -L/usr/X11R6/lib -ldl -lSM -lXrender -lpng -lmng -ljpeg -lGL -lXinerama -lqt-mt -lXext -lX11 -lm -lpthread
+LIBS = $(SUBLIBS)
-Wl,-rpath,$(QTDIR)/lib -L$(QTDIR)/lib -L/usr/X11R6/lib -lqt-mt -ldl -lSM -lXrender -lpng -lmng -ljpeg -lGL -lXinerama -lqt-mt -lpthread -lXext -lX11 -lm
AR = ar cqs
RANLIB =
MOC = $(QTDIR)/bin/moc
AR = ar cqs
RANLIB =
MOC = $(QTDIR)/bin/moc
@@
-28,16
+28,12
@@
QMAKE = qmake
TAR = tar -cf
GZIP = gzip -9f
COPY = cp -f
TAR = tar -cf
GZIP = gzip -9f
COPY = cp -f
-COPY_FILE= $(COPY)
-COPY_DIR = $(COPY) -r
-INSTALL_FILE= $(COPY_FILE)
-INSTALL_DIR = $(COPY_DIR)
+COPY_FILE= $(COPY) -p
+COPY_DIR = $(COPY) -pR
DEL_FILE = rm -f
SYMLINK = ln -sf
DEL_DIR = rmdir
DEL_FILE = rm -f
SYMLINK = ln -sf
DEL_DIR = rmdir
-MOVE = mv -f
-CHK_DIR_EXISTS= test -d
-MKDIR = mkdir -p
+MOVE = mv
####### Output directory
####### Output directory
@@
-81,14
+77,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 = SALOME_InstallWizard
-DESTDIR =
../bin/
+QMAKE_TARGET =
../bin/
SALOME_InstallWizard
+DESTDIR =
TARGET = ../bin/SALOME_InstallWizard
first: all
####### Implicit rules
TARGET = ../bin/SALOME_InstallWizard
first: all
####### Implicit rules
-.SUFFIXES: .c .
o .
cpp .cc .cxx .C
+.SUFFIXES: .c .cpp .cc .cxx .C
.cpp.o:
$(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
.cpp.o:
$(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
@@
-109,23
+105,21
@@
first: all
all: Makefile $(TARGET)
all: Makefile $(TARGET)
-$(TARGET): $(UICDECLS) $(OBJECTS) $(OBJMOC)
- test -d ../bin/ || mkdir -p ../bin/
- $(LINK) $(LFLAGS) -o $(TARGET) $(OBJECTS) $(OBJMOC) $(OBJCOMP) $(LIBS)
+$(TARGET): $(UICDECLS) $(OBJECTS) $(OBJMOC)
+ $(LINK) $(LFLAGS) -o $(TARGET) $(OBJECTS) $(OBJMOC) $(LIBS)
mocables: $(SRCMOC)
mocables: $(SRCMOC)
-uicables: $(UICDECLS) $(UICIMPLS)
$(MOC):
$(MOC):
- ( cd $(QTDIR)/src/moc
&&
$(MAKE) )
+ ( cd $(QTDIR)/src/moc
;
$(MAKE) )
-Makefile: SALOME_INSTALL.pro
/usr/lib/qt3/mkspecs/default/qmake.conf /usr/lib/qt3/lib/libqt-mt.prl
- $(QMAKE)
-o Makefile
SALOME_INSTALL.pro
+Makefile: SALOME_INSTALL.pro
$(QTDIR)/mkspecs/default/qmake.conf
+ $(QMAKE) SALOME_INSTALL.pro
qmake:
qmake:
- @$(QMAKE)
-o Makefile
SALOME_INSTALL.pro
+ @$(QMAKE) SALOME_INSTALL.pro
dist:
dist:
- @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
+ @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
mocclean:
-$(DEL_FILE) $(OBJMOC)
mocclean:
-$(DEL_FILE) $(OBJMOC)
@@
-133,17
+127,15
@@
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)
../bin/
$(TARGET) $(TARGET)
+ -$(DEL_FILE) $(TARGET) $(TARGET)
FORCE:
FORCE:
@@
-182,13
+174,13
@@
InstallWizard.o: InstallWizard.cpp InstallWizard.h
icons.o: icons.cxx icons.h
icons.o: icons.cxx icons.h
-moc_SALOME_InstallWizard.o: moc_SALOME_InstallWizard.cpp
SALOME_InstallWizard.hxx InstallWizard.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
@@
-204,7
+196,7
@@
moc_InstallWizard.cpp: $(MOC) InstallWizard.h
####### Install
####### Install
-install:
+install:
all
-uninstall:
+uninstall: