reorg share directory, split each lib into its own dir

diff --git a/src/share/Makefile.am b/src/share/Makefile.am
index 23890cc..7964637 100644 (file)
--- a/src/share/Makefile.am
+++ b/src/share/Makefile.am
@@ -1,28 +1,22 @@
-## Process this file with automake to produce Makefile.in
-
-AUTOMAKE_OPTIONS = foreign
-
-INCLUDES = -I$(top_srcdir)/include/share
-
-noinst_LIBRARIES = libutf8.a libgetopt.a
-
-libutf8_a_SOURCES = charset.c charset.h iconvert.c utf8.c
-
-libgetopt_a_SOURCES = getopt.c getopt1.c
+#  FLAC - Free Lossless Audio Codec
+#  Copyright (C) 2002  Josh Coalson
+#
+#  This program is part of FLAC; you can redistribute it and/or
+#  modify it under the terms of the GNU General Public License
+#  as published by the Free Software Foundation; either version 2
+#  of the License, or (at your option) any later version.
+#
+#  This program is distributed in the hope that it will be useful,
+#  but WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#  GNU General Public License for more details.
+#
+#  You should have received a copy of the GNU General Public License
+#  along with this program; if not, write to the Free Software
+#  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+
+SUBDIRS = getopt utf8
 
 EXTRA_DIST = \
-       Makefile.lite \
        Makefile.vc \
-       README \
-       charmaps.h \
-       makemap.c \
-       charset_test.c \
-       charsetmap.h \
-       getopt.dsp \
-       utf8.dsp
-
-debug:
-       $(MAKE) all CFLAGS="@DEBUG@"
-
-profile:
-       $(MAKE) all CFLAGS="@PROFILE@"
+       README

diff --git a/src/share/Makefile.lite b/src/share/Makefile.lite
deleted file mode 100644 (file)
index 3ac74d0..0000000
--- a/src/share/Makefile.lite
+++ /dev/null
@@ -1,42 +0,0 @@
-#
-# GNU makefile
-#
-
-topdir = ../..
-
-LIB_NAME = libgetopt
-INCLUDES = -I$(topdir)/include -I$(topdir)/include/share
-
-OBJS = \
-       getopt.o \
-       getopt1.o
-
-include $(topdir)/build/lib.mk
-
-# Our lame Makefile.lite system has no provision for building multiple libs in
-# a directory, so we hack it:
-UTF8_LIB_NAME = libutf8
-UTF8_OBJS = charset.o iconvert.o utf8.o
-UTF8_STATIC_LIB = $(LIBPATH)/$(UTF8_LIB_NAME).$(STATIC_LIB_SUFFIX)
-UTF8_DYNAMIC_LIB = $(LIBPATH)/$(UTF8_LIB_NAME).$(DYNAMIC_LIB_SUFFIX)
-
-debug: $(UTF8_STATIC_LIB) $(UTF8_DYNAMIC_LIB)
-
-release: $(UTF8_STATIC_LIB) $(UTF8_DYNAMIC_LIB)
-
-clean: utf8_clean
-
-utf8_clean:
-       rm -f $(UTF8_OBJS) $(UTF8_STATIC_LIB) $(UTF8_DYNAMIC_LIB)
-
-$(UTF8_STATIC_LIB): $(UTF8_OBJS)
-       $(LINK) $@ $(UTF8_OBJS) && ranlib $@
-
-$(UTF8_DYNAMIC_LIB): $(UTF8_OBJS)
-ifeq ($(DARWIN_BUILD),yes)
-       $(LINKD) -o $@ $(UTF8_OBJS) $(LFLAGS) $(LIBS) -lc
-else
-       $(LINKD) -o $@ $(UTF8_OBJS) $(LFLAGS) $(LIBS)
-endif
-
-# DO NOT DELETE THIS LINE -- make depend depends on it.

diff --git a/src/share/Makefile.vc b/src/share/Makefile.vc
index 15f9c3a..d697920 100644 (file)
--- a/src/share/Makefile.vc
+++ b/src/share/Makefile.vc
@@ -1,35 +1,19 @@
 !include <win32.mak>\r
 \r
-!IFDEF DEBUG\r
-.c.obj:\r
-       $(cc) /D "_LIB" -DFLAC__NO_DLL /GX $(cdebug) $(cflags) /I "..\..\include" /I "..\..\include\share" -DSTRICT -YX /Od /D "_DEBUG" $<\r
-!else\r
-.c.obj:\r
-       $(cc) /D "_LIB" -DFLAC__NO_DLL /O2 $(crelease) $(cflags) /I "..\..\include" /I "..\..\include\share" -DSTRICT -YX -DNODEBUG $<\r
-!endif\r
+# It's less hassle to spell it all out that to figure out how to do it right with nmake:\r
 \r
-C_FILES= \\r
-       getopt.c \\r
-       getopt1.c\r
-\r
-UTF8_C_FILES= \\r
-       charset.c \\r
-       iconvert.c \\r
-       utf8.c\r
-\r
-OBJS= $(C_FILES:.c=.obj)\r
-\r
-UTF8_OBJS= $(UTF8_C_FILES:.c=.obj)\r
-\r
-all: getopt.lib utf8.lib\r
-\r
-getopt.lib: $(OBJS)\r
-       link.exe -lib /nodefaultlib -out:../../obj/lib/$*.lib $(OBJS)\r
-\r
-utf8.lib: $(UTF8_OBJS)\r
-       link.exe -lib /nodefaultlib -out:../../obj/lib/$*.lib $(UTF8_OBJS)\r
+all:\r
+       cd getopt\r
+       nmake /f Makefile.vc\r
+       cd ..\r
+       cd utf8\r
+       nmake /f Makefile.vc\r
+       cd ..\r
 \r
 clean:\r
-       -del *.obj *.pch\r
-       -del ..\..\obj\lib\getopt.lib ..\..\obj\lib\getopt.pdb\r
-       -del ..\..\obj\lib\utf8.lib ..\..\obj\lib\utf8.pdb\r
+       cd getopt\r
+       nmake /f Makefile.vc clean\r
+       cd ..\r
+       cd utf8\r
+       nmake /f Makefile.vc clean\r
+       cd ..\r

diff --git a/src/share/getopt/Makefile.am b/src/share/getopt/Makefile.am
new file mode 100644 (file)
index 0000000..1636f91
--- /dev/null
+++ b/src/share/getopt/Makefile.am
@@ -0,0 +1,20 @@
+## Process this file with automake to produce Makefile.in
+
+AUTOMAKE_OPTIONS = foreign
+
+INCLUDES = -I$(top_srcdir)/include/share
+
+noinst_LIBRARIES = libgetopt.a
+
+libgetopt_a_SOURCES = getopt.c getopt1.c
+
+EXTRA_DIST = \
+       Makefile.lite \
+       Makefile.vc \
+       getopt.dsp
+
+debug:
+       $(MAKE) all CFLAGS="@DEBUG@"
+
+profile:
+       $(MAKE) all CFLAGS="@PROFILE@"

diff --git a/src/share/getopt/Makefile.lite b/src/share/getopt/Makefile.lite
new file mode 100644 (file)
index 0000000..4120403
--- /dev/null
+++ b/src/share/getopt/Makefile.lite
@@ -0,0 +1,16 @@
+#
+# GNU makefile
+#
+
+topdir = ../../..
+
+LIB_NAME = libgetopt
+INCLUDES = -I$(topdir)/include -I$(topdir)/include/share
+
+OBJS = \
+       getopt.o \
+       getopt1.o
+
+include $(topdir)/build/lib.mk
+
+# DO NOT DELETE THIS LINE -- make depend depends on it.

diff --git a/src/share/getopt/Makefile.vc b/src/share/getopt/Makefile.vc
new file mode 100644 (file)
index 0000000..0f1a51d
--- /dev/null
+++ b/src/share/getopt/Makefile.vc
@@ -0,0 +1,24 @@
+!include <win32.mak>\r
+\r
+!IFDEF DEBUG\r
+.c.obj:\r
+       $(cc) /D "_LIB" -DFLAC__NO_DLL /GX $(cdebug) $(cflags) /I "..\..\..\include" /I "..\..\..\include\share" -DSTRICT -YX /Od /D "_DEBUG" $<\r
+!else\r
+.c.obj:\r
+       $(cc) /D "_LIB" -DFLAC__NO_DLL /O2 $(crelease) $(cflags) /I "..\..\..\include" /I "..\..\..\include\share" -DSTRICT -YX -DNODEBUG $<\r
+!endif\r
+\r
+C_FILES= \\r
+       getopt.c \\r
+       getopt1.c\r
+\r
+OBJS= $(C_FILES:.c=.obj)\r
+\r
+all: getopt.lib\r
+\r
+getopt.lib: $(OBJS)\r
+       link.exe -lib /nodefaultlib -out:../../../obj/lib/$*.lib $(OBJS)\r
+\r
+clean:\r
+       -del *.obj *.pch\r
+       -del ..\..\..\obj\lib\getopt.lib ..\..\..\obj\lib\getopt.pdb\r

diff --git a/src/share/getopt.c b/src/share/getopt/getopt.c
similarity index 100%
rename from src/share/getopt.c
rename to src/share/getopt/getopt.c

diff --git a/src/share/getopt.dsp b/src/share/getopt/getopt.dsp
similarity index 84%
rename from src/share/getopt.dsp
rename to src/share/getopt/getopt.dsp
index c45e3c8..f092ab2 100644 (file)
--- a/src/share/getopt.dsp
+++ b/src/share/getopt/getopt.dsp
@@ -24,7 +24,7 @@ CFG=getopt - Win32 Debug
 # Begin Project\r
 # PROP AllowPerConfigDependencies 0\r
 # PROP Scc_ProjName "getopt"\r
-# PROP Scc_LocalPath "..\.."\r
+# PROP Scc_LocalPath "..\..\.."\r
 CPP=cl.exe\r
 MTL=midl.exe\r
 RSC=rc.exe\r
@@ -38,12 +38,12 @@ RSC=rc.exe
 # PROP BASE Target_Dir ""\r
 # PROP Use_MFC 0\r
 # PROP Use_Debug_Libraries 0\r
-# PROP Output_Dir "..\..\obj\lib"\r
+# PROP Output_Dir "..\..\..\obj\lib"\r
 # PROP Intermediate_Dir "Release"\r
 # PROP Ignore_Export_Lib 0\r
 # PROP Target_Dir ""\r
 # ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c\r
-# ADD CPP /nologo /MD /W3 /GR /GX /O2 /I ".\include" /I "..\..\include" /D "NDEBUG" /D "GETOPT_API_EXPORTS" /D "_WINDOWS" /D "_WINDLL" /D "WIN32" /D "_USRDLL" /FR /FD /c\r
+# ADD CPP /nologo /MD /W3 /GR /GX /O2 /I ".\include" /I "..\..\..\include" /D "NDEBUG" /D "GETOPT_API_EXPORTS" /D "_WINDOWS" /D "_WINDLL" /D "WIN32" /D "_USRDLL" /FR /FD /c\r
 # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32\r
 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32\r
 # ADD BASE RSC /l 0x409 /d "NDEBUG"\r
@@ -53,7 +53,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo\r
 LINK32=link.exe\r
 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /dll /machine:I386\r
-# ADD LINK32 /nologo /subsystem:windows /dll /machine:I386 /out:"..\..\obj\bin/getopt.dll"\r
+# ADD LINK32 /nologo /subsystem:windows /dll /machine:I386 /out:"..\..\..\obj\bin/getopt.dll"\r
 \r
 !ELSEIF  "$(CFG)" == "getopt - Win32 Debug"\r
 \r
@@ -64,12 +64,12 @@ LINK32=link.exe
 # PROP BASE Target_Dir ""\r
 # PROP Use_MFC 0\r
 # PROP Use_Debug_Libraries 1\r
-# PROP Output_Dir "..\..\obj\lib"\r
+# PROP Output_Dir "..\..\..\obj\lib"\r
 # PROP Intermediate_Dir "Debug"\r
 # PROP Ignore_Export_Lib 0\r
 # PROP Target_Dir ""\r
 # ADD BASE CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c\r
-# ADD CPP /nologo /MDd /W3 /Gm /GR /GX /ZI /Od /I ".\include" /I "..\..\include" /D "_DEBUG" /D "_CHATTER" /D "GETOPT_API_EXPORTS" /D "_WINDOWS" /D "_WINDLL" /D "WIN32" /D "_USRDLL" /FR /FD /c\r
+# ADD CPP /nologo /MDd /W3 /Gm /GR /GX /ZI /Od /I ".\include" /I "..\..\..\include" /D "_DEBUG" /D "_CHATTER" /D "GETOPT_API_EXPORTS" /D "_WINDOWS" /D "_WINDLL" /D "WIN32" /D "_USRDLL" /FR /FD /c\r
 # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32\r
 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32\r
 # ADD BASE RSC /l 0x409 /d "_DEBUG"\r
@@ -79,7 +79,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo\r
 LINK32=link.exe\r
 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /dll /debug /machine:I386 /pdbtype:sept\r
-# ADD LINK32 /nologo /subsystem:windows /dll /debug /machine:I386 /out:"..\..\obj\bin/getopt.dll" /pdbtype:sept\r
+# ADD LINK32 /nologo /subsystem:windows /dll /debug /machine:I386 /out:"..\..\..\obj\bin/getopt.dll" /pdbtype:sept\r
 \r
 !ENDIF \r
 \r
@@ -112,7 +112,7 @@ SOURCE=.\getopt1.c
 # PROP Default_Filter ""\r
 # Begin Source File\r
 \r
-SOURCE=..\..\include\share\getopt.h\r
+SOURCE=..\..\..\include\share\getopt.h\r
 # End Source File\r
 # End Group\r
 # End Target\r

diff --git a/src/share/getopt1.c b/src/share/getopt/getopt1.c
similarity index 100%
rename from src/share/getopt1.c
rename to src/share/getopt/getopt1.c

diff --git a/src/share/utf8/Makefile.am b/src/share/utf8/Makefile.am
new file mode 100644 (file)
index 0000000..dbe2287
--- /dev/null
+++ b/src/share/utf8/Makefile.am
@@ -0,0 +1,25 @@
+## Process this file with automake to produce Makefile.in
+
+AUTOMAKE_OPTIONS = foreign
+
+INCLUDES = -I$(top_srcdir)/include/share
+
+noinst_LIBRARIES = libutf8.a
+
+libutf8_a_SOURCES = charset.c charset.h iconvert.c utf8.c
+
+EXTRA_DIST = \
+       Makefile.lite \
+       Makefile.vc \
+       README \
+       charmaps.h \
+       makemap.c \
+       charset_test.c \
+       charsetmap.h \
+       utf8.dsp
+
+debug:
+       $(MAKE) all CFLAGS="@DEBUG@"
+
+profile:
+       $(MAKE) all CFLAGS="@PROFILE@"

diff --git a/src/share/utf8/Makefile.lite b/src/share/utf8/Makefile.lite
new file mode 100644 (file)
index 0000000..6ffa3b2
--- /dev/null
+++ b/src/share/utf8/Makefile.lite
@@ -0,0 +1,17 @@
+#
+# GNU makefile
+#
+
+topdir = ../../..
+
+LIB_NAME = libutf8
+INCLUDES = -I$(topdir)/include -I$(topdir)/include/share
+
+OBJS = \
+       charset.o \
+       iconvert.o \
+       utf8.o
+
+include $(topdir)/build/lib.mk
+
+# DO NOT DELETE THIS LINE -- make depend depends on it.

diff --git a/src/share/utf8/Makefile.vc b/src/share/utf8/Makefile.vc
new file mode 100644 (file)
index 0000000..2fa8a87
--- /dev/null
+++ b/src/share/utf8/Makefile.vc
@@ -0,0 +1,25 @@
+!include <win32.mak>\r
+\r
+!IFDEF DEBUG\r
+.c.obj:\r
+       $(cc) /D "_LIB" -DFLAC__NO_DLL /GX $(cdebug) $(cflags) /I "..\..\..\include" /I "..\..\..\include\share" -DSTRICT -YX /Od /D "_DEBUG" $<\r
+!else\r
+.c.obj:\r
+       $(cc) /D "_LIB" -DFLAC__NO_DLL /O2 $(crelease) $(cflags) /I "..\..\..\include" /I "..\..\..\include\share" -DSTRICT -YX -DNODEBUG $<\r
+!endif\r
+\r
+C_FILES= \\r
+       charset.c \\r
+       iconvert.c \\r
+       utf8.c\r
+\r
+OBJS= $(C_FILES:.c=.obj)\r
+\r
+all: utf8.lib\r
+\r
+utf8.lib: $(UTF8_OBJS)\r
+       link.exe -lib /nodefaultlib -out:../../../obj/lib/$*.lib $(UTF8_OBJS)\r
+\r
+clean:\r
+       -del *.obj *.pch\r
+       -del ..\..\..\obj\lib\utf8.lib ..\..\..\obj\lib\utf8.pdb\r

diff --git a/src/share/charmaps.h b/src/share/utf8/charmaps.h
similarity index 100%
rename from src/share/charmaps.h
rename to src/share/utf8/charmaps.h

diff --git a/src/share/charset.c b/src/share/utf8/charset.c
similarity index 100%
rename from src/share/charset.c
rename to src/share/utf8/charset.c

diff --git a/src/share/charset.h b/src/share/utf8/charset.h
similarity index 100%
rename from src/share/charset.h
rename to src/share/utf8/charset.h

diff --git a/src/share/charset_test.c b/src/share/utf8/charset_test.c
similarity index 100%
rename from src/share/charset_test.c
rename to src/share/utf8/charset_test.c

diff --git a/src/share/charsetmap.h b/src/share/utf8/charsetmap.h
similarity index 100%
rename from src/share/charsetmap.h
rename to src/share/utf8/charsetmap.h

diff --git a/src/share/iconvert.c b/src/share/utf8/iconvert.c
similarity index 100%
rename from src/share/iconvert.c
rename to src/share/utf8/iconvert.c

diff --git a/src/share/makemap.c b/src/share/utf8/makemap.c
similarity index 100%
rename from src/share/makemap.c
rename to src/share/utf8/makemap.c

diff --git a/src/share/utf8.c b/src/share/utf8/utf8.c
similarity index 100%
rename from src/share/utf8.c
rename to src/share/utf8/utf8.c

diff --git a/src/share/utf8.dsp b/src/share/utf8/utf8.dsp
similarity index 84%
rename from src/share/utf8.dsp
rename to src/share/utf8/utf8.dsp
index effbc82..dd2e3eb 100644 (file)
--- a/src/share/utf8.dsp
+++ b/src/share/utf8/utf8.dsp
@@ -24,7 +24,7 @@ CFG=utf8 - Win32 Debug
 # Begin Project\r
 # PROP AllowPerConfigDependencies 0\r
 # PROP Scc_ProjName "utf8"\r
-# PROP Scc_LocalPath "..\.."\r
+# PROP Scc_LocalPath "..\..\.."\r
 CPP=cl.exe\r
 MTL=midl.exe\r
 RSC=rc.exe\r
@@ -38,12 +38,12 @@ RSC=rc.exe
 # PROP BASE Target_Dir ""\r
 # PROP Use_MFC 0\r
 # PROP Use_Debug_Libraries 0\r
-# PROP Output_Dir "..\..\obj\lib"\r
+# PROP Output_Dir "..\..\..\obj\lib"\r
 # PROP Intermediate_Dir "Release"\r
 # PROP Ignore_Export_Lib 0\r
 # PROP Target_Dir ""\r
 # ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c\r
-# ADD CPP /nologo /MD /W3 /GR /GX /O2 /I ".\include" /I "..\..\include\share" /D "NDEBUG" /D "UTF8_API_EXPORTS" /D "_WINDOWS" /D "_WINDLL" /D "WIN32" /D "_USRDLL" /FR /FD /c\r
+# ADD CPP /nologo /MD /W3 /GR /GX /O2 /I ".\include" /I "..\..\..\include\share" /D "NDEBUG" /D "UTF8_API_EXPORTS" /D "_WINDOWS" /D "_WINDLL" /D "WIN32" /D "_USRDLL" /FR /FD /c\r
 # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32\r
 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32\r
 # ADD BASE RSC /l 0x409 /d "NDEBUG"\r
@@ -53,7 +53,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo\r
 LINK32=link.exe\r
 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /dll /machine:I386\r
-# ADD LINK32 /nologo /subsystem:windows /dll /machine:I386 /out:"..\..\obj\bin/utf8.dll"\r
+# ADD LINK32 /nologo /subsystem:windows /dll /machine:I386 /out:"..\..\..\obj\bin/utf8.dll"\r
 \r
 !ELSEIF  "$(CFG)" == "utf8 - Win32 Debug"\r
 \r
@@ -64,12 +64,12 @@ LINK32=link.exe
 # PROP BASE Target_Dir ""\r
 # PROP Use_MFC 0\r
 # PROP Use_Debug_Libraries 1\r
-# PROP Output_Dir "..\..\obj\lib"\r
+# PROP Output_Dir "..\..\..\obj\lib"\r
 # PROP Intermediate_Dir "Debug"\r
 # PROP Ignore_Export_Lib 0\r
 # PROP Target_Dir ""\r
 # ADD BASE CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c\r
-# ADD CPP /nologo /MDd /W3 /Gm /GR /GX /ZI /Od /I ".\include" /I "..\..\include\share" /D "_DEBUG" /D "_CHATTER" /D "UTF8_API_EXPORTS" /D "_WINDOWS" /D "_WINDLL" /D "WIN32" /D "_USRDLL" /FR /FD /c\r
+# ADD CPP /nologo /MDd /W3 /Gm /GR /GX /ZI /Od /I ".\include" /I "..\..\..\include\share" /D "_DEBUG" /D "_CHATTER" /D "UTF8_API_EXPORTS" /D "_WINDOWS" /D "_WINDLL" /D "WIN32" /D "_USRDLL" /FR /FD /c\r
 # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32\r
 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32\r
 # ADD BASE RSC /l 0x409 /d "_DEBUG"\r
@@ -79,7 +79,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo\r
 LINK32=link.exe\r
 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /dll /debug /machine:I386 /pdbtype:sept\r
-# ADD LINK32 /nologo /subsystem:windows /dll /debug /machine:I386 /out:"..\..\obj\bin/utf8.dll" /pdbtype:sept\r
+# ADD LINK32 /nologo /subsystem:windows /dll /debug /machine:I386 /out:"..\..\..\obj\bin/utf8.dll" /pdbtype:sept\r
 \r
 !ENDIF \r
 \r
@@ -116,7 +116,7 @@ SOURCE=.\utf8.c
 # PROP Default_Filter ""\r
 # Begin Source File\r
 \r
-SOURCE=..\..\include\share\utf8.h\r
+SOURCE=..\..\..\include\share\utf8.h\r
 # End Source File\r
 # End Group\r
 # End Target\r