Attachment #201663 for bug #237572

Lines 6-12 Link Here

(-)scilab-5.1.1-orig/libs/MALLOC/Makefile.am (-1 / +1 lines)
6	MALLOC_C_SOURCES = src/sci_mem_alloc.c src/getmaxMALLOC.c	6	MALLOC_C_SOURCES = src/sci_mem_alloc.c src/getmaxMALLOC.c
7		7
8	if IS_64_BITS_CPU	8	if IS_64_BITS_CPU
9	MALLOC_C_SOURCES += src/malloc.c	9	#MALLOC_C_SOURCES += src/malloc.c
10	endif	10	endif
11		11
12	libscimalloc_la_includedir=$(pkgincludedir)/malloc	12	libscimalloc_la_includedir=$(pkgincludedir)/malloc




POST_UNINSTALL = :
build_triplet = @build@
host_triplet = @host@
@IS_64_BITS_CPU_TRUE@am__append_1 = src/malloc.c
DIST_COMMON = $(libscimalloc_la_include_HEADERS) $(srcdir)/Makefile.am \
	$(srcdir)/Makefile.in $(top_srcdir)/Makefile.incl.am
@NEED_JAVA_TRUE@am__append_1 = java
subdir = libs/MALLOC
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/m4/docbook.m4 \

pkglibLTLIBRARIES_INSTALL = $(INSTALL)
LTLIBRARIES = $(pkglib_LTLIBRARIES)
libscimalloc_la_DEPENDENCIES =
am__objects_1 = libscimalloc_la-sci_mem_alloc.lo \
	libscimalloc_la-getmaxMALLOC.lo
am_libscimalloc_la_OBJECTS = $(am__objects_1)
am__objects_2 = libscimalloc_la-sci_mem_alloc.lo \
	libscimalloc_la-getmaxMALLOC.lo $(am__objects_1)
am_libscimalloc_la_OBJECTS = $(am__objects_2)
libscimalloc_la_OBJECTS = $(am_libscimalloc_la_OBJECTS)
libscimalloc_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(libscimalloc_la_CFLAGS) \

	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
	$(LDFLAGS) -o $@
SOURCES = $(libscimalloc_la_SOURCES)
DIST_SOURCES = $(libscimalloc_la_SOURCES)
libscimalloc_la_includeHEADERS_INSTALL = $(INSTALL_HEADER)
HEADERS = $(libscimalloc_la_include_HEADERS)
ETAGS = etags

top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
MALLOC_C_SOURCES = src/sci_mem_alloc.c src/getmaxMALLOC.c 

#MALLOC_C_SOURCES += src/malloc.c
libscimalloc_la_includedir = $(pkgincludedir)/malloc
libscimalloc_la_include_HEADERS = includes/sci_mem_alloc.h \
includes/MALLOC.h \

#### the procedure will be the same with Microsoft Windows (C)
#### and Linux/Unix
#######################################################################
TARGETS_ALL = $(am__append_1)

################ MACROS ######################
# Rule to build a macro

	-rm -f *.tab.c

@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscimalloc_la-getmaxMALLOC.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscimalloc_la-malloc.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscimalloc_la-sci_mem_alloc.Plo@am__quote@

.c.o:

@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libscimalloc_la_CFLAGS) $(CFLAGS) -c -o libscimalloc_la-getmaxMALLOC.lo `test -f 'src/getmaxMALLOC.c' || echo '$(srcdir)/'`src/getmaxMALLOC.c

libscimalloc_la-malloc.lo: src/malloc.c
@am__fastdepCC_TRUE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libscimalloc_la_CFLAGS) $(CFLAGS) -MT libscimalloc_la-malloc.lo -MD -MP -MF $(DEPDIR)/libscimalloc_la-malloc.Tpo -c -o libscimalloc_la-malloc.lo `test -f 'src/malloc.c' || echo '$(srcdir)/'`src/malloc.c
@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/libscimalloc_la-malloc.Tpo $(DEPDIR)/libscimalloc_la-malloc.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='src/malloc.c' object='libscimalloc_la-malloc.lo' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libscimalloc_la_CFLAGS) $(CFLAGS) -c -o libscimalloc_la-malloc.lo `test -f 'src/malloc.c' || echo '$(srcdir)/'`src/malloc.c

mostlyclean-libtool:
	-rm -f *.lo


Return to bug 237572

Lines 54-63 Link Here

(-)scilab-5.1.1-orig/libs/MALLOC/Makefile.in (-20 / +9 lines)
54	POST_UNINSTALL = :	54	POST_UNINSTALL = :
55	build_triplet = @build@	55	build_triplet = @build@
56	host_triplet = @host@	56	host_triplet = @host@
57	@IS_64_BITS_CPU_TRUE@am__append_1 = src/malloc.c
58	DIST_COMMON = $(libscimalloc_la_include_HEADERS) $(srcdir)/Makefile.am \	57	DIST_COMMON = $(libscimalloc_la_include_HEADERS) $(srcdir)/Makefile.am \
59	$(srcdir)/Makefile.in $(top_srcdir)/Makefile.incl.am	58	$(srcdir)/Makefile.in $(top_srcdir)/Makefile.incl.am
60	@NEED_JAVA_TRUE@am__append_2 = java	59	@NEED_JAVA_TRUE@am__append_1 = java
61	subdir = libs/MALLOC	60	subdir = libs/MALLOC
62	ACLOCAL_M4 = $(top_srcdir)/aclocal.m4	61	ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
63	am__aclocal_m4_deps = $(top_srcdir)/m4/docbook.m4 \	62	am__aclocal_m4_deps = $(top_srcdir)/m4/docbook.m4 \
Lines 88-99 Link Here
88	pkglibLTLIBRARIES_INSTALL = $(INSTALL)	87	pkglibLTLIBRARIES_INSTALL = $(INSTALL)
89	LTLIBRARIES = $(pkglib_LTLIBRARIES)	88	LTLIBRARIES = $(pkglib_LTLIBRARIES)
90	libscimalloc_la_DEPENDENCIES =	89	libscimalloc_la_DEPENDENCIES =
91	am__libscimalloc_la_SOURCES_DIST = src/sci_mem_alloc.c \	90	am__objects_1 = libscimalloc_la-sci_mem_alloc.lo \
92	src/getmaxMALLOC.c src/malloc.c	91	libscimalloc_la-getmaxMALLOC.lo
93	@IS_64_BITS_CPU_TRUE@am__objects_1 = libscimalloc_la-malloc.lo	92	am_libscimalloc_la_OBJECTS = $(am__objects_1)
94	am__objects_2 = libscimalloc_la-sci_mem_alloc.lo \
95	libscimalloc_la-getmaxMALLOC.lo $(am__objects_1)
96	am_libscimalloc_la_OBJECTS = $(am__objects_2)
97	libscimalloc_la_OBJECTS = $(am_libscimalloc_la_OBJECTS)	93	libscimalloc_la_OBJECTS = $(am_libscimalloc_la_OBJECTS)
98	libscimalloc_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \	94	libscimalloc_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
99	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(libscimalloc_la_CFLAGS) \	95	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(libscimalloc_la_CFLAGS) \
Lines 111-117 Link Here
111	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \	107	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
112	$(LDFLAGS) -o $@	108	$(LDFLAGS) -o $@
113	SOURCES = $(libscimalloc_la_SOURCES)	109	SOURCES = $(libscimalloc_la_SOURCES)
114	DIST_SOURCES = $(am__libscimalloc_la_SOURCES_DIST)	110	DIST_SOURCES = $(libscimalloc_la_SOURCES)
115	libscimalloc_la_includeHEADERS_INSTALL = $(INSTALL_HEADER)	111	libscimalloc_la_includeHEADERS_INSTALL = $(INSTALL_HEADER)
116	HEADERS = $(libscimalloc_la_include_HEADERS)	112	HEADERS = $(libscimalloc_la_include_HEADERS)
117	ETAGS = etags	113	ETAGS = etags
Lines 312-319 Link Here
312	top_build_prefix = @top_build_prefix@	308	top_build_prefix = @top_build_prefix@
313	top_builddir = @top_builddir@	309	top_builddir = @top_builddir@
314	top_srcdir = @top_srcdir@	310	top_srcdir = @top_srcdir@
315	MALLOC_C_SOURCES = src/sci_mem_alloc.c src/getmaxMALLOC.c \	311	MALLOC_C_SOURCES = src/sci_mem_alloc.c src/getmaxMALLOC.c
316	$(am__append_1)	312
		313	#MALLOC_C_SOURCES += src/malloc.c
317	libscimalloc_la_includedir = $(pkgincludedir)/malloc	314	libscimalloc_la_includedir = $(pkgincludedir)/malloc
318	libscimalloc_la_include_HEADERS = includes/sci_mem_alloc.h \	315	libscimalloc_la_include_HEADERS = includes/sci_mem_alloc.h \
319	includes/MALLOC.h \	316	includes/MALLOC.h \
Lines 344-350 Link Here
344	#### the procedure will be the same with Microsoft Windows (C)	341	#### the procedure will be the same with Microsoft Windows (C)
345	#### and Linux/Unix	342	#### and Linux/Unix
346	#######################################################################	343	#######################################################################
347	TARGETS_ALL = $(am__append_2)	344	TARGETS_ALL = $(am__append_1)
348		345
349	################ MACROS ######################	346	################ MACROS ######################
350	# Rule to build a macro	347	# Rule to build a macro
Lines 462-468 Link Here
462	-rm -f *.tab.c	459	-rm -f *.tab.c
463		460
464	@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscimalloc_la-getmaxMALLOC.Plo@am__quote@	461	@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscimalloc_la-getmaxMALLOC.Plo@am__quote@
465	@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscimalloc_la-malloc.Plo@am__quote@
466	@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscimalloc_la-sci_mem_alloc.Plo@am__quote@	462	@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscimalloc_la-sci_mem_alloc.Plo@am__quote@
467		463
468	.c.o:	464	.c.o:
Lines 500-512 Link Here
500	@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@	496	@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
501	@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libscimalloc_la_CFLAGS) $(CFLAGS) -c -o libscimalloc_la-getmaxMALLOC.lo `test -f 'src/getmaxMALLOC.c' \|\| echo '$(srcdir)/'`src/getmaxMALLOC.c	497	@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libscimalloc_la_CFLAGS) $(CFLAGS) -c -o libscimalloc_la-getmaxMALLOC.lo `test -f 'src/getmaxMALLOC.c' \|\| echo '$(srcdir)/'`src/getmaxMALLOC.c
502		498
503	libscimalloc_la-malloc.lo: src/malloc.c
504	@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libscimalloc_la_CFLAGS) $(CFLAGS) -MT libscimalloc_la-malloc.lo -MD -MP -MF $(DEPDIR)/libscimalloc_la-malloc.Tpo -c -o libscimalloc_la-malloc.lo `test -f 'src/malloc.c' \|\| echo '$(srcdir)/'`src/malloc.c
505	@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libscimalloc_la-malloc.Tpo $(DEPDIR)/libscimalloc_la-malloc.Plo
506	@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='src/malloc.c' object='libscimalloc_la-malloc.lo' libtool=yes @AMDEPBACKSLASH@
507	@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
508	@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libscimalloc_la_CFLAGS) $(CFLAGS) -c -o libscimalloc_la-malloc.lo `test -f 'src/malloc.c' \|\| echo '$(srcdir)/'`src/malloc.c
509
510	mostlyclean-libtool:	499	mostlyclean-libtool:
511	-rm -f *.lo	500	-rm -f *.lo
512		501