Changeset 1559

Show
Ignore:
Timestamp:
02/19/08 17:51:37 (7 months ago)
Author:
till
Message:

nebula
- CFLAGS+=-D_GNU_SOURCE
- compatibility type casts

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • nebula/trunk/src/Makefile.am

    r1558 r1559  
    1 AM_CFLAGS=-Wall -Werror 
     1AM_CFLAGS=-Wall -Werror -D_GNU_SOURCE 
    22 
    33LIBS += -lm -lz -lpthread 

  • nebula/trunk/src/Makefile.in

    r1558 r1559  
    1 # Makefile.in generated by automake 1.10 from Makefile.am. 
     1# Makefile.in generated by automake 1.9.6 from Makefile.am. 
    22# @configure_input@ 
    33 
    44# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 
    5 # 2003, 2004, 2005, 2006  Free Software Foundation, Inc. 
     5# 2003, 2004, 2005  Free Software Foundation, Inc. 
    66# This Makefile.in is free software; the Free Software Foundation 
    77# gives unlimited permission to copy and/or distribute it, 
    …… 
    1515@SET_MAKE@ 
    1616 
     17srcdir = @srcdir@ 
     18top_srcdir = @top_srcdir@ 
    1719VPATH = @srcdir@ 
    1820pkgdatadir = $(datadir)/@PACKAGE@ 
    1921pkglibdir = $(libdir)/@PACKAGE@ 
    2022pkgincludedir = $(includedir)/@PACKAGE@ 
     23top_builddir = .. 
    2124am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd 
     25INSTALL = @INSTALL@ 
    2226install_sh_DATA = $(install_sh) -c -m 644 
    2327install_sh_PROGRAM = $(install_sh) -c 
    …… 
    5155nebula_OBJECTS = $(am_nebula_OBJECTS) 
    5256nebula_LDADD = $(LDADD) 
    53 DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@ 
     57DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) 
    5458depcomp = $(SHELL) $(top_srcdir)/depcomp 
    5559am__depfiles_maybe = depfiles 
    …… 
    6468DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) 
    6569ACLOCAL = @ACLOCAL@ 
     70AMDEP_FALSE = @AMDEP_FALSE@ 
     71AMDEP_TRUE = @AMDEP_TRUE@ 
    6672AMTAR = @AMTAR@ 
    6773AUTOCONF = @AUTOCONF@ 
    …… 
    8086ECHO_T = @ECHO_T@ 
    8187EXEEXT = @EXEEXT@ 
    82 INSTALL = @INSTALL@ 
    8388INSTALL_DATA = @INSTALL_DATA@ 
    8489INSTALL_PROGRAM = @INSTALL_PROGRAM@ 
    …… 
    9095LTLIBOBJS = @LTLIBOBJS@ 
    9196MAKEINFO = @MAKEINFO@ 
    92 MKDIR_P = @MKDIR_P@ 
    9397OBJEXT = @OBJEXT@ 
    9498PACKAGE = @PACKAGE@ 
    …… 
    103107STRIP = @STRIP@ 
    104108VERSION = @VERSION@ 
    105 abs_builddir = @abs_builddir@ 
    106 abs_srcdir = @abs_srcdir@ 
    107 abs_top_builddir = @abs_top_builddir@ 
    108 abs_top_srcdir = @abs_top_srcdir@ 
    109109ac_ct_CC = @ac_ct_CC@ 
     110am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ 
     111am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ 
    110112am__include = @am__include@ 
    111113am__leading_dot = @am__leading_dot@ 
    …… 
    115117bindir = @bindir@ 
    116118build_alias = @build_alias@ 
    117 builddir = @builddir@ 
    118119datadir = @datadir@ 
    119120datarootdir = @datarootdir@ 
    …… 
    139140sbindir = @sbindir@ 
    140141sharedstatedir = @sharedstatedir@ 
    141 srcdir = @srcdir@ 
    142142sysconfdir = @sysconfdir@ 
    143143target_alias = @target_alias@ 
    144 top_builddir = @top_builddir@ 
    145 top_srcdir = @top_srcdir@ 
    146 AM_CFLAGS = -Wall -Werror 
     144AM_CFLAGS = -Wall -Werror -D_GNU_SOURCE 
    147145nebula_SOURCES = signals.c signals.h \ 
    148146                        md5.c md5.h \ 
    …… 
    198196install-binPROGRAMS: $(bin_PROGRAMS) 
    199197        @$(NORMAL_INSTALL) 
    200         test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)" 
     198        test -z "$(bindir)" || $(mkdir_p) "$(DESTDIR)$(bindir)" 
    201199        @list='$(bin_PROGRAMS)'; for p in $$list; do \ 
    202200          p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \ 
    …… 
    221219nebula$(EXEEXT): $(nebula_OBJECTS) $(nebula_DEPENDENCIES)  
    222220        @rm -f nebula$(EXEEXT) 
    223         $(LINK) $(nebula_OBJECTS) $(nebula_LDADD) $(LIBS) 
     221        $(LINK) $(nebula_LDFLAGS) $(nebula_OBJECTS) $(nebula_LDADD) $(LIBS) 
    224222 
    225223mostlyclean-compile: 
    …… 
    248246 
    249247.c.o: 
    250 @am__fastdepCC_TRUE@    $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< 
    251 @am__fastdepCC_TRUE@    mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po 
     248@am__fastdepCC_TRUE@    if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \ 
     249@am__fastdepCC_TRUE@    then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi 
    252250@AMDEP_TRUE@@am__fastdepCC_FALSE@       source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ 
    253251@AMDEP_TRUE@@am__fastdepCC_FALSE@       DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ 
    …… 
    255253 
    256254.c.obj: 
    257 @am__fastdepCC_TRUE@    $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` 
    258 @am__fastdepCC_TRUE@    mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po 
     255@am__fastdepCC_TRUE@    if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \ 
     256@am__fastdepCC_TRUE@    then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi 
    259257@AMDEP_TRUE@@am__fastdepCC_FALSE@       source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ 
    260258@AMDEP_TRUE@@am__fastdepCC_FALSE@       DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ 
    261259@am__fastdepCC_FALSE@   $(COMPILE) -c `$(CYGPATH_W) '$<'` 
     260uninstall-info-am: 
    262261 
    263262ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) 
    …… 
    310309 
    311310distdir: $(DISTFILES) 
    312         @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ 
    313         topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ 
    314         list='$(DISTFILES)'; \ 
    315           dist_files=`for file in $$list; do echo $$file; done | \ 
    316           sed -e "s|^$$srcdirstrip/||;t" \ 
    317               -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ 
    318         case $$dist_files in \ 
    319           */*) $(MKDIR_P) `echo "$$dist_files" | \ 
    320                            sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ 
    321                            sort -u` ;; \ 
    322         esac; \ 
    323         for file in $$dist_files; do \ 
     311        @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ 
     312        topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ 
     313        list='$(DISTFILES)'; for file in $$list; do \ 
     314          case $$file in \ 
     315            $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ 
     316            $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ 
     317          esac; \ 
    324318          if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ 
     319          dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ 
     320          if test "$$dir" != "$$file" && test "$$dir" != "."; then \ 
     321            dir="/$$dir"; \ 
     322            $(mkdir_p) "$(distdir)$$dir"; \ 
     323          else \ 
     324            dir=''; \ 
     325          fi; \ 
    325326          if test -d $$d/$$file; then \ 
    326             dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ 
    327327            if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ 
    328328              cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ 
    …… 
    340340installdirs: 
    341341        for dir in "$(DESTDIR)$(bindir)"; do \ 
    342           test -z "$$dir" || $(MKDIR_P) "$$dir"; \ 
     342          test -z "$$dir" || $(mkdir_p) "$$dir"; \ 
    343343        done 
    344344install: install-am 
    …… 
    388388install-data-am: 
    389389 
    390 install-dvi: install-dvi-am 
    391  
    392390install-exec-am: install-binPROGRAMS 
    393391 
    394 install-html: install-html-am 
    395  
    396392install-info: install-info-am 
    397393 
    398394install-man: 
    399  
    400 install-pdf: install-pdf-am 
    401  
    402 install-ps: install-ps-am 
    403395 
    404396installcheck-am: 
    …… 
    421413ps-am: 
    422414 
    423 uninstall-am: uninstall-binPROGRAMS 
    424  
    425 .MAKE: install-am install-strip 
     415uninstall-am: uninstall-binPROGRAMS uninstall-info-am 
    426416 
    427417.PHONY: CTAGS GTAGS all all-am check check-am clean clean-binPROGRAMS \ 
    …… 
    429419        distclean-generic distclean-tags distdir dvi dvi-am html \ 
    430420        html-am info info-am install install-am install-binPROGRAMS \ 
    431         install-data install-data-am install-dvi install-dvi-am \ 
    432         install-exec install-exec-am install-html install-html-am \ 
    433         install-info install-info-am install-man install-pdf \ 
    434         install-pdf-am install-ps install-ps-am install-strip \ 
     421        install-data install-data-am install-exec install-exec-am \ 
     422        install-info install-info-am install-man install-strip \ 
    435423        installcheck installcheck-am installdirs maintainer-clean \ 
    436424        maintainer-clean-generic mostlyclean mostlyclean-compile \ 
    437425        mostlyclean-generic pdf pdf-am ps ps-am tags uninstall \ 
    438         uninstall-am uninstall-binPROGRAMS 
     426        uninstall-am uninstall-binPROGRAMS uninstall-info-am 
    439427 
    440428# Tell versions [3.59,3.63) of GNU make to not export all variables. 

  • nebula/trunk/src/nebula.h

    r1558 r1559  
    2222#define __NEBULA_H 1 
    2323 
     24 
    2425#if HAVE_CONFIG_H 
    2526# include <config.h> 
    2627#endif 
    2728 
    28 #include <sys/types.h> 
    2929#include <pthread.h> 
    3030 

  • nebula/trunk/src/sig.c

    r1558 r1559  
    337337                exit(EXIT_FAILURE); 
    338338        } 
    339         if (verbose) printf("Generalized suffix tree contains a common subtree with %u leaves.\n", cstr_list.len); 
    340  
    341  
    342         // print (common subtree of) GST 
    343 //      ST_PrintTree(gst, 0); 
     339        if (verbose) printf("Generalized suffix tree contains a common subtree with %lu leaves.\n", (long unsigned int) cstr_list.len); 
    344340 
    345341 
    …… 
    348344        qsort(cstr_list.elem, cstr_list.len, sizeof(substr), substr_len_cmp); 
    349345 
    350         if (verbose) printf("Extracting common substrings with length >= %u.\n", min_sstr_len); 
     346        if (verbose) printf("Extracting common substrings with length >= %lu.\n", (long unsigned int) min_sstr_len); 
    351347//      for (i = 0; i < cstr_list.len && cstr_list.elem[i].len >= min_sstr_len; i++) 
    352348//              list_substrings(gst, cstr_list.elem[i].n, cstr_list.elem[i].len);