Files scilab-5.1.1-orig/libs/MALLOC/.Makefile.in.swp and scilab-5.1.1/libs/MALLOC/.Makefile.in.swp differ diff -urN scilab-5.1.1-orig/libs/MALLOC/Makefile.am scilab-5.1.1/libs/MALLOC/Makefile.am --- scilab-5.1.1-orig/libs/MALLOC/Makefile.am 2009-04-14 03:30:41.000000000 -0400 +++ scilab-5.1.1/libs/MALLOC/Makefile.am 2009-08-18 22:13:07.000000000 -0400 @@ -6,7 +6,7 @@ MALLOC_C_SOURCES = src/sci_mem_alloc.c src/getmaxMALLOC.c if IS_64_BITS_CPU -MALLOC_C_SOURCES += src/malloc.c +#MALLOC_C_SOURCES += src/malloc.c endif libscimalloc_la_includedir=$(pkgincludedir)/malloc diff -urN scilab-5.1.1-orig/libs/MALLOC/Makefile.in scilab-5.1.1/libs/MALLOC/Makefile.in --- scilab-5.1.1-orig/libs/MALLOC/Makefile.in 2009-04-14 03:30:41.000000000 -0400 +++ scilab-5.1.1/libs/MALLOC/Makefile.in 2009-08-18 22:13:07.000000000 -0400 @@ -54,10 +54,9 @@ 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_2 = java +@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 \ @@ -88,12 +87,9 @@ pkglibLTLIBRARIES_INSTALL = $(INSTALL) LTLIBRARIES = $(pkglib_LTLIBRARIES) libscimalloc_la_DEPENDENCIES = -am__libscimalloc_la_SOURCES_DIST = src/sci_mem_alloc.c \ - src/getmaxMALLOC.c src/malloc.c -@IS_64_BITS_CPU_TRUE@am__objects_1 = libscimalloc_la-malloc.lo -am__objects_2 = libscimalloc_la-sci_mem_alloc.lo \ - libscimalloc_la-getmaxMALLOC.lo $(am__objects_1) -am_libscimalloc_la_OBJECTS = $(am__objects_2) +am__objects_1 = libscimalloc_la-sci_mem_alloc.lo \ + libscimalloc_la-getmaxMALLOC.lo +am_libscimalloc_la_OBJECTS = $(am__objects_1) libscimalloc_la_OBJECTS = $(am_libscimalloc_la_OBJECTS) libscimalloc_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(libscimalloc_la_CFLAGS) \ @@ -111,7 +107,7 @@ --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ $(LDFLAGS) -o $@ SOURCES = $(libscimalloc_la_SOURCES) -DIST_SOURCES = $(am__libscimalloc_la_SOURCES_DIST) +DIST_SOURCES = $(libscimalloc_la_SOURCES) libscimalloc_la_includeHEADERS_INSTALL = $(INSTALL_HEADER) HEADERS = $(libscimalloc_la_include_HEADERS) ETAGS = etags @@ -312,8 +308,9 @@ 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 \ - $(am__append_1) +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 \ @@ -344,7 +341,7 @@ #### the procedure will be the same with Microsoft Windows (C) #### and Linux/Unix ####################################################################### -TARGETS_ALL = $(am__append_2) +TARGETS_ALL = $(am__append_1) ################ MACROS ###################### # Rule to build a macro @@ -462,7 +459,6 @@ -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: @@ -500,13 +496,6 @@ @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