From 987dc01cabbc306fc1c1334cb33f40a76514069b Mon Sep 17 00:00:00 2001 From: Francois Gouget Date: Tue, 14 Dec 2004 11:42:30 +0000 Subject: [PATCH] Remove references to ./configure and Makefile.in files. --- documentation/winelib-bindlls.sgml | 2 +- documentation/winelib-intro.sgml | 30 ++++-------------------- documentation/winelib-toolkit.sgml | 48 ++++++++++---------------------------- 3 files changed, 17 insertions(+), 63 deletions(-) diff --git a/documentation/winelib-bindlls.sgml b/documentation/winelib-bindlls.sgml index f8a61b36f48..7afb5760473 100644 --- a/documentation/winelib-bindlls.sgml +++ b/documentation/winelib-bindlls.sgml @@ -224,7 +224,7 @@ signed short WINAPI MyProxyWinFunc (unsigned short a, void *b, void *c, - After running winemaker I like to edit the Makefile.in to add the line + After running winemaker I like to edit the Makefile to add the line CEXTRA = -Wall just before the DEFINES =. diff --git a/documentation/winelib-intro.sgml b/documentation/winelib-intro.sgml index e0e41319159..a00bc3f61ed 100644 --- a/documentation/winelib-intro.sgml +++ b/documentation/winelib-intro.sgml @@ -400,23 +400,6 @@ - - - - Before you run make you must run the - autoconf configure script. The goal of this - step is to analyze your system and generate customized - makefiles from the Makefile.in files. This - is also when you have to tell where Winelib resides on your - system. If wine is installed in a single directory or you have - the Wine sources compiled somewhere then you can just run - ./configure --with-wine=/usr/local/bin - or ./configure --with-wine=~/wine - respectively. - - - - @@ -427,9 +410,10 @@ - review the Makefile.in files to - adjust the default compilation and link options set by - winemaker. See the Makefile files to + adjust what winemaker thinks are the binaries you are + trying to build and which sources should be used for + each. See the section for some hints. @@ -442,12 +426,6 @@ - - If you find yourself modifying the Makefile.in to specify the - location of the Wine header or library files then go back to - the previous step (the configure script) and use the various - --with-wine-* options to specify where they are. - diff --git a/documentation/winelib-toolkit.sgml b/documentation/winelib-toolkit.sgml index 6ce2a55f2ca..a13d21da69f 100644 --- a/documentation/winelib-toolkit.sgml +++ b/documentation/winelib-toolkit.sgml @@ -61,7 +61,7 @@ First are executables and DLLs. Each time it finds one of these in a directory, winemaker puts it in the list of things to build and - will later generate a Makefile.in file in this + will later generate a Makefile file in this directory. Note that Winemaker also knows about the commonly used Release and Debug directories, so it will attribute the executables and libraries @@ -109,7 +109,7 @@ these targets based on their names. Source files that do not seem to match any specific target are put in a global list for this directory, see the EXTRA_xxx variables in the - Makefile.in, and linked with each of the + Makefile, and linked with each of the targets. The assumption here is that these source files contain common code which is shared by all the targets. If no targets were found in the directory where these files are @@ -151,10 +151,8 @@ ). - Finally winemaker generates the Makefile.in - files and other support files (wrapper files, spec files, - configure.in, - Make.rules.in). From the above description + Finally winemaker generates the Makefile + files. From the above description you can guess at the items that winemaker may get wrong in this phase: macro definitions, include path, DLL path, DLLs to import, library path, libraries to link with. You can deal with @@ -173,7 +171,7 @@ others will not compile if it is. Fortunately all the files in a given source tree use the same setting so that all you have to do is add -DSTRICT on winemaker's command line - or in the Makefile.in file(s). + or in the Makefile file(s). Finally the most likely reasons for missing or duplicate symbols @@ -186,7 +184,7 @@ being linked with the right set of libraries. You can avoid this by using winemaker's and @@ -194,7 +192,7 @@ Maybe you have multiple targets in a single directory and winemaker guessed wrong when trying to match the source files with the targets. The only way to fix this kind of problem is - to edit the Makefile.in file manually. + to edit the Makefile file manually. @@ -204,7 +202,7 @@ sibling directory, e.g. if you link with ../hello/world.o then you will get missing symbols. Again the only solution is to manually edit the - Makefile.in file. + Makefile file. @@ -219,18 +217,10 @@ - - The Makefile.in files - - The Makefile.in is your makefile. More - precisely it is the template from which the actual makefile will - be generated by the configure script. It also - relies on the Make.rules file for most of - the actual logic. This way it only contains a relatively simple - description of what needs to be built, not the complex logic of - how things are actually built. - + + The Makefile files + The Makefile is your makefile. So this is the file to modify if you want to customize things. Here's a detailed description of its content: @@ -247,7 +237,7 @@ VPATH = @srcdir@ variables make it possible to have per-architecture directories for compiled files and other similar goodies (But note that this kind of functionality has not been tested with winemaker generated - Makefile.in files yet). + Makefile files yet). SUBDIRS = @@ -407,20 +397,6 @@ ENDS) to modify them. - - - The Make.rules.in file - - What's in the Make.rules.in... - - - - - The configure.in file - - What's in the configure.in... - - -- 2.11.4.GIT