Changeset 22795

Show
Ignore:
Timestamp:
26.08.2010 14:46:00 (9 years ago)
Author:
mdewsnip
Message:

Updated Linux and Windows makefiles in common-src/src/lib to no longer include md5.

Location:
main/trunk/gs2-core/common-src/src/lib
Files:
3 modified

Legend:

Unmodified
Added
Removed
  • main/trunk/gs2-core/common-src/src/lib/Makefile.am

    r22740 r22795  
    3333    gsdlunicode.cpp \ 
    3434    infodbclass.cpp \ 
    35     md5.cpp \ 
    3635    OIDtools.cpp \ 
    3736    phrases.cpp \ 
  • main/trunk/gs2-core/common-src/src/lib/Makefile.in

    r22740 r22795  
    6868    dbclass.cpp display.cpp fileutil.cpp gsdlsitecfg.cpp \ 
    6969    gsdltimes.cpp gsdltools.cpp gsdlunicode.cpp infodbclass.cpp \ 
    70     md5.cpp OIDtools.cpp phrases.cpp sqldbclass.cpp text_t.cpp \ 
    71     unitool.cpp sqlitedbclass.cpp 
     70    OIDtools.cpp phrases.cpp sqldbclass.cpp text_t.cpp unitool.cpp \ 
     71    sqlitedbclass.cpp 
    7272@USE_SQLITE_TRUE@am__objects_1 = libgsdllib_a-sqlitedbclass.$(OBJEXT) 
    7373am_libgsdllib_a_OBJECTS = libgsdllib_a-cfgread.$(OBJEXT) \ 
     
    7979    libgsdllib_a-gsdltools.$(OBJEXT) \ 
    8080    libgsdllib_a-gsdlunicode.$(OBJEXT) \ 
    81     libgsdllib_a-infodbclass.$(OBJEXT) libgsdllib_a-md5.$(OBJEXT) \ 
     81    libgsdllib_a-infodbclass.$(OBJEXT) \ 
    8282    libgsdllib_a-OIDtools.$(OBJEXT) libgsdllib_a-phrases.$(OBJEXT) \ 
    8383    libgsdllib_a-sqldbclass.$(OBJEXT) \ 
     
    194194    dbclass.cpp display.cpp fileutil.cpp gsdlsitecfg.cpp \ 
    195195    gsdltimes.cpp gsdltools.cpp gsdlunicode.cpp infodbclass.cpp \ 
    196     md5.cpp OIDtools.cpp phrases.cpp sqldbclass.cpp text_t.cpp \ 
    197     unitool.cpp $(am__append_2) 
     196    OIDtools.cpp phrases.cpp sqldbclass.cpp text_t.cpp unitool.cpp \ 
     197    $(am__append_2) 
    198198all: all-am 
    199199 
     
    255255@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgsdllib_a-gsdlunicode.Po@am__quote@ 
    256256@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgsdllib_a-infodbclass.Po@am__quote@ 
    257 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgsdllib_a-md5.Po@am__quote@ 
    258257@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgsdllib_a-phrases.Po@am__quote@ 
    259258@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgsdllib_a-sqldbclass.Po@am__quote@ 
     
    429428@AMDEP_TRUE@@am__fastdepCXX_FALSE@  DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ 
    430429@am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgsdllib_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libgsdllib_a-infodbclass.obj `if test -f 'infodbclass.cpp'; then $(CYGPATH_W) 'infodbclass.cpp'; else $(CYGPATH_W) '$(srcdir)/infodbclass.cpp'; fi` 
    431  
    432 libgsdllib_a-md5.o: md5.cpp 
    433 @am__fastdepCXX_TRUE@   if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgsdllib_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libgsdllib_a-md5.o -MD -MP -MF "$(DEPDIR)/libgsdllib_a-md5.Tpo" -c -o libgsdllib_a-md5.o `test -f 'md5.cpp' || echo '$(srcdir)/'`md5.cpp; \ 
    434 @am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/libgsdllib_a-md5.Tpo" "$(DEPDIR)/libgsdllib_a-md5.Po"; else rm -f "$(DEPDIR)/libgsdllib_a-md5.Tpo"; exit 1; fi 
    435 @AMDEP_TRUE@@am__fastdepCXX_FALSE@  source='md5.cpp' object='libgsdllib_a-md5.o' libtool=no @AMDEPBACKSLASH@ 
    436 @AMDEP_TRUE@@am__fastdepCXX_FALSE@  DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ 
    437 @am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgsdllib_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libgsdllib_a-md5.o `test -f 'md5.cpp' || echo '$(srcdir)/'`md5.cpp 
    438  
    439 libgsdllib_a-md5.obj: md5.cpp 
    440 @am__fastdepCXX_TRUE@   if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgsdllib_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libgsdllib_a-md5.obj -MD -MP -MF "$(DEPDIR)/libgsdllib_a-md5.Tpo" -c -o libgsdllib_a-md5.obj `if test -f 'md5.cpp'; then $(CYGPATH_W) 'md5.cpp'; else $(CYGPATH_W) '$(srcdir)/md5.cpp'; fi`; \ 
    441 @am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/libgsdllib_a-md5.Tpo" "$(DEPDIR)/libgsdllib_a-md5.Po"; else rm -f "$(DEPDIR)/libgsdllib_a-md5.Tpo"; exit 1; fi 
    442 @AMDEP_TRUE@@am__fastdepCXX_FALSE@  source='md5.cpp' object='libgsdllib_a-md5.obj' libtool=no @AMDEPBACKSLASH@ 
    443 @AMDEP_TRUE@@am__fastdepCXX_FALSE@  DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ 
    444 @am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgsdllib_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libgsdllib_a-md5.obj `if test -f 'md5.cpp'; then $(CYGPATH_W) 'md5.cpp'; else $(CYGPATH_W) '$(srcdir)/md5.cpp'; fi` 
    445430 
    446431libgsdllib_a-OIDtools.o: OIDtools.cpp 
  • main/trunk/gs2-core/common-src/src/lib/win32.mak

    r22756 r22795  
    3232    gsdlunicode.obj \ 
    3333    infodbclass.obj \ 
    34     md5.obj \ 
    3534    OIDtools.obj \ 
    3635    phrases.obj \