summaryrefslogtreecommitdiffstats
path: root/scilab/modules/metanet
diff options
context:
space:
mode:
authorSylvestre Ledru <sylvestre.ledru@scilab.org>2009-10-11 23:36:57 +0200
committerSylvestre Ledru <sylvestre.ledru@scilab.org>2009-10-11 23:36:57 +0200
commit269e80c63c5fe4ba6dae4259a529b819e04ae5c1 (patch)
tree81ca7428f32d034b878ac0b49c11b8d85ea5ed2d /scilab/modules/metanet
parent61400b6dd5d899d808fddf1b14099c007b705fab (diff)
downloadscilab-269e80c63c5fe4ba6dae4259a529b819e04ae5c1.zip
scilab-269e80c63c5fe4ba6dae4259a529b819e04ae5c1.tar.gz
Merged fixed
Diffstat (limited to 'scilab/modules/metanet')
-rw-r--r--scilab/modules/metanet/Makefile.in32
1 files changed, 0 insertions, 32 deletions
diff --git a/scilab/modules/metanet/Makefile.in b/scilab/modules/metanet/Makefile.in
index 821777f..b9daf86 100644
--- a/scilab/modules/metanet/Makefile.in
+++ b/scilab/modules/metanet/Makefile.in
@@ -104,12 +104,7 @@ am__base_list = \
104am__installdirs = "$(DESTDIR)$(pkglibdir)" \ 104am__installdirs = "$(DESTDIR)$(pkglibdir)" \
105 "$(DESTDIR)$(libscimetanet_la_etcdir)" \ 105 "$(DESTDIR)$(libscimetanet_la_etcdir)" \
106 "$(DESTDIR)$(libscimetanet_la_rootdir)" \ 106 "$(DESTDIR)$(libscimetanet_la_rootdir)" \
107<<<<<<< HEAD:scilab/modules/metanet/Makefile.in
108 "$(DESTDIR)$(libscimetanet_la_sci_gatewaydir)" 107 "$(DESTDIR)$(libscimetanet_la_sci_gatewaydir)"
109=======
110 "$(DESTDIR)$(libscimetanet_la_sci_gatewaydir)" \
111 "$(DESTDIR)$(libscimetanet_la_includedir)"
112>>>>>>> origin/5.1:scilab/modules/metanet/Makefile.in
113LTLIBRARIES = $(pkglib_LTLIBRARIES) 108LTLIBRARIES = $(pkglib_LTLIBRARIES)
114libscimetanet_la_DEPENDENCIES = \ 109libscimetanet_la_DEPENDENCIES = \
115 $(top_builddir)/libs/hashtable/libscihashtable.la \ 110 $(top_builddir)/libs/hashtable/libscihashtable.la \
@@ -178,10 +173,6 @@ SOURCES = $(libscimetanet_la_SOURCES)
178DIST_SOURCES = $(libscimetanet_la_SOURCES) 173DIST_SOURCES = $(libscimetanet_la_SOURCES)
179DATA = $(libscimetanet_la_etc_DATA) $(libscimetanet_la_root_DATA) \ 174DATA = $(libscimetanet_la_etc_DATA) $(libscimetanet_la_root_DATA) \
180 $(libscimetanet_la_sci_gateway_DATA) 175 $(libscimetanet_la_sci_gateway_DATA)
181<<<<<<< HEAD:scilab/modules/metanet/Makefile.in
182=======
183HEADERS = $(libscimetanet_la_include_HEADERS)
184>>>>>>> origin/5.1:scilab/modules/metanet/Makefile.in
185ETAGS = etags 176ETAGS = etags
186CTAGS = ctags 177CTAGS = ctags
187DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) 178DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
@@ -1163,29 +1154,6 @@ uninstall-libscimetanet_la_sci_gatewayDATA:
1163 test -n "$$files" || exit 0; \ 1154 test -n "$$files" || exit 0; \
1164 echo " ( cd '$(DESTDIR)$(libscimetanet_la_sci_gatewaydir)' && rm -f" $$files ")"; \ 1155 echo " ( cd '$(DESTDIR)$(libscimetanet_la_sci_gatewaydir)' && rm -f" $$files ")"; \
1165 cd "$(DESTDIR)$(libscimetanet_la_sci_gatewaydir)" && rm -f $$files 1156 cd "$(DESTDIR)$(libscimetanet_la_sci_gatewaydir)" && rm -f $$files
1166<<<<<<< HEAD:scilab/modules/metanet/Makefile.in
1167=======
1168install-libscimetanet_la_includeHEADERS: $(libscimetanet_la_include_HEADERS)
1169 @$(NORMAL_INSTALL)
1170 test -z "$(libscimetanet_la_includedir)" || $(MKDIR_P) "$(DESTDIR)$(libscimetanet_la_includedir)"
1171 @list='$(libscimetanet_la_include_HEADERS)'; test -n "$(libscimetanet_la_includedir)" || list=; \
1172 for p in $$list; do \
1173 if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
1174 echo "$$d$$p"; \
1175 done | $(am__base_list) | \
1176 while read files; do \
1177 echo " $(INSTALL_HEADER) $$files '$(DESTDIR)$(libscimetanet_la_includedir)'"; \
1178 $(INSTALL_HEADER) $$files "$(DESTDIR)$(libscimetanet_la_includedir)" || exit $$?; \
1179 done
1180
1181uninstall-libscimetanet_la_includeHEADERS:
1182 @$(NORMAL_UNINSTALL)
1183 @list='$(libscimetanet_la_include_HEADERS)'; test -n "$(libscimetanet_la_includedir)" || list=; \
1184 files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
1185 test -n "$$files" || exit 0; \
1186 echo " ( cd '$(DESTDIR)$(libscimetanet_la_includedir)' && rm -f" $$files ")"; \
1187 cd "$(DESTDIR)$(libscimetanet_la_includedir)" && rm -f $$files
1188>>>>>>> origin/5.1:scilab/modules/metanet/Makefile.in
1189 1157
1190ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) 1158ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
1191 list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ 1159 list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \