Salome HOME
projects
/
modules
/
superv.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
There was a wrong error message in the .log file
[modules/superv.git]
/
Makefile.in
diff --git
a/Makefile.in
b/Makefile.in
index 4f3a43de24b78a75b239e09480b335eab8f7f649..5fbee4dd1ff0754adb0172d3eb955d89fd9f5000 100644
(file)
--- a/
Makefile.in
+++ b/
Makefile.in
@@
-14,7
+14,7
@@
VPATH=.:@srcdir@:@top_srcdir@/bin:@top_srcdir@/resources:./bin:@top_srcdir@/idl
@COMMENCE@
@COMMENCE@
-SUBDIRS = idl src
+SUBDIRS = idl src
examples doc
RESOURCES_FILES = \
components.png \
RESOURCES_FILES = \
components.png \
@@
-30,10
+30,14
@@
run.png \
steps.png \
SUPERV_en.xml \
SUPERV_fr.xml \
steps.png \
SUPERV_en.xml \
SUPERV_fr.xml \
+SUPERV.config \
SUPERVCatalog.xml \
suspend-resume.gif \
Superv_tree_superv.png
SUPERVCatalog.xml \
suspend-resume.gif \
Superv_tree_superv.png
+BIN_SCRIPT= \
+VERSION
+
# copy header files in common directory
ifeq ($(HAVE_SSTREAM),yes)
include_list=include/salome/SALOMEconfig.h
# copy header files in common directory
ifeq ($(HAVE_SSTREAM),yes)
include_list=include/salome/SALOMEconfig.h
@@
-43,10
+47,19
@@
endif
inc: idl $(include_list)
inc: idl $(include_list)
-include/salome/SALOMEconfig.h: salome_adm/unix/SALOMEconfig.
h
+include/salome/SALOMEconfig.h: salome_adm/unix/SALOMEconfig.
ref
-$(RM) $@
$(LN_S) ../../$< $@
-$(RM) $@
$(LN_S) ../../$< $@
+# test if SALOMEconfig.h has changed (contents)
+salome_adm/unix/SALOMEconfig.ref: salome_adm/unix/SALOMEconfig.h
+ @if ! [ -a $@ ]; then \
+ cp -p -f $< $@; \
+ fi; \
+ if ! cmp $< $@; then \
+ cp -p -f $< $@; \
+ fi; \
+
include/salome/sstream: salome_adm/unix/sstream
-$(RM) $@
$(LN_S) ../../$< $@
include/salome/sstream: salome_adm/unix/sstream
-$(RM) $@
$(LN_S) ../../$< $@
@@
-68,7
+81,7
@@
install-include: $(include_list)
$(INSTALL) -d $(includedir)
@for f in X $(include_list); do \
if test $$f != X; then \
$(INSTALL) -d $(includedir)
@for f in X $(include_list); do \
if test $$f != X; then \
- ($(INSTALL_DATA)
$$f $(includedir)/. || exit 1);
\
+ ($(INSTALL_DATA)
-p $$f $(includedir)/. || exit 1);
\
fi; \
done
fi; \
done