diff --git a/expat/lib/Makefile.in b/expat/lib/Makefile.in index 24c43d94..583818af 100644 --- a/expat/lib/Makefile.in +++ b/expat/lib/Makefile.in @@ -61,7 +61,6 @@ LN_S = @LN_S@ OBJDUMP = @OBJDUMP@ PACKAGE = @PACKAGE@ RANLIB = @RANLIB@ -VERSION = @VERSION@ LIBRARY = libexpat.la SOURCES = xmlparse.c xmltok.c xmlrole.c @@ -78,7 +77,7 @@ CONFIG_HEADER = ../config.h CONFIG_CLEAN_FILES = INCLUDES = -I$(srcdir) -I.. -DEFS = @DEFS@ -DPACKAGE='"$(PACKAGE)"' -DVERSION='"$(PACKAGE)_$(VERSION)"' +DEFS = @DEFS@ -DPACKAGE='"$(PACKAGE)"' CPPFLAGS = @CPPFLAGS@ LDFLAGS = @LDFLAGS@ LIBS = @LIBS@ diff --git a/expat/lib/expat.dsp b/expat/lib/expat.dsp index 13950e17..5eb2685a 100644 --- a/expat/lib/expat.dsp +++ b/expat/lib/expat.dsp @@ -93,13 +93,9 @@ LINK32=link.exe SOURCE=.\xmlparse.c -!IF "$(CFG)" == "expat - Win32 Release" +!IF "$(CFG)" == "expat - Win32 Debug" -# ADD CPP /D VERSION="expat_1.95.1" - -!ELSEIF "$(CFG)" == "expat - Win32 Debug" - -# ADD CPP /GX- /Od /D VERSION="\"expat_1.95.1\"" +# ADD CPP /GX- /Od !ENDIF @@ -108,44 +104,19 @@ SOURCE=.\xmlparse.c SOURCE=.\xmlrole.c -!IF "$(CFG)" == "expat - Win32 Release" - -# ADD CPP /D VERSION=\"expat_1.95.1\" - -!ELSEIF "$(CFG)" == "expat - Win32 Debug" - -# ADD CPP /D VERSION=\"expat_1.95.1\" - -!ENDIF - # End Source File # Begin Source File SOURCE=.\xmltok.c -!IF "$(CFG)" == "expat - Win32 Release" - -# ADD CPP /D VERSION=\"expat_1.95.1\" - -!ELSEIF "$(CFG)" == "expat - Win32 Debug" - -# ADD CPP /D VERSION=\"expat_1.95.1\" - -!ENDIF - # End Source File # Begin Source File SOURCE=xmltok_impl.c -!IF "$(CFG)" == "expat - Win32 Release" - -# ADD CPP /D VERSION=\"expat_1.95.1\" - -!ELSEIF "$(CFG)" == "expat - Win32 Debug" +!IF "$(CFG)" == "expat - Win32 Debug" # PROP Exclude_From_Build 1 -# ADD CPP /D VERSION=\"expat_1.95.1\" !ENDIF @@ -154,14 +125,9 @@ SOURCE=xmltok_impl.c SOURCE=xmltok_ns.c -!IF "$(CFG)" == "expat - Win32 Release" - -# ADD CPP /D VERSION=\"expat_1.95.1\" - -!ELSEIF "$(CFG)" == "expat - Win32 Debug" +!IF "$(CFG)" == "expat - Win32 Debug" # PROP Exclude_From_Build 1 -# ADD CPP /D VERSION=\"expat_1.95.1\" !ENDIF