--- a/LibraryDefinition.st	Fri Aug 18 19:15:42 2006 +0200
+++ b/LibraryDefinition.st	Fri Aug 18 19:19:39 2006 +0200
@@ -263,7 +263,7 @@
 
 
 PACKAGE=$(MODULE):$(MODULE_DIR)
-STCLOCALOPT=-I. $(LOCALINCLUDES) $(STCLOCALOPTIMIZATIONS) $(STCWARNINGS) $(LOCALDEFINES) -H. ''-P$(PACKAGE)'' ''-Z$(LIBNAME)'' %(COMMONSYMFLAG)
+STCLOCALOPT=-I. $(LOCALINCLUDES) $(STCLOCALOPTIMIZATIONS) $(STCWARNINGS) $(LOCALDEFINES) %(HEADEROUTPUTARG) ''-P$(PACKAGE)'' ''-Z$(LIBNAME)'' %(COMMONSYMFLAG)
 
 
 # ********** OPTIONAL: MODIFY the next line ***
@@ -443,7 +443,7 @@
 LOCALINCLUDES=%(LOCAL_INCLUDES)
 
 PACKAGE=$(MODULE):$(MODULE_DIR)
-STCLOCALOPT=-I. $(LOCALINCLUDES) -H. $(STCLOCALOPTIMIZATIONS) $(STCWARNINGS) $(LOCALDEFINES) ''-P$(PACKAGE)'' ''-Z$(LIBNAME)'' %(COMMONSYMFLAG)
+STCLOCALOPT=-I. $(LOCALINCLUDES) %(HEADEROUTPUTARG) $(STCLOCALOPTIMIZATIONS) $(STCWARNINGS) $(LOCALDEFINES) ''-P$(PACKAGE)'' ''-Z$(LIBNAME)'' %(COMMONSYMFLAG)
 RESFILES=%(RESFILENAME)
 
 ALL::  $(LIBDIR)\$(LIBNAME).lib $(BINDIR)\$(LIBNAME).dll
@@ -530,6 +530,7 @@
         at: #'LOCAL_INCLUDES' put: [self generateUnixLocalIncludes];
         at: #'LOCAL_DEFINES' put: '';
         at: #'COMMONSYMFLAG' put: (self commonSymbolsFlag);
+        at: #'HEADEROUTPUTARG' put: (self headerFileOutputArg);
         yourself
 
     "Created: / 09-08-2006 / 11:20:45 / fm"
@@ -543,7 +544,8 @@
     d := super make_dot_spec_mappings.
     d
         at: #'LIBRARY_NAME' put: ( self libraryName );
-        at: #'OBJECTS' put: [self generateObjects_make_dot_spec].
+        at: #'OBJECTS' put: [self generateObjects_make_dot_spec];
+        yourself.
     ^ d
 
     "Created: / 09-08-2006 / 11:21:06 / fm"
@@ -570,7 +572,9 @@
     d
         at: #'LOCAL_INCLUDES' put: [self generateMsdosLocalIncludes];
         at: #'COMMONSYMFLAG' put: (self commonSymbolsFlag);
-        at: #'RESFILENAME' put: resFileName.
+        at: #'HEADEROUTPUTARG' put: (self headerFileOutputArg);
+        at: #'RESFILENAME' put: resFileName;
+        yourself.
     ^ d.
 
     "Created: / 09-08-2006 / 11:44:36 / fm"
@@ -768,6 +772,25 @@
 
     "Created: / 09-08-2006 / 16:46:49 / fm"
     "Modified: / 18-08-2006 / 11:58:45 / cg"
+!
+
+headerFileOutputArg
+    "all stx stuff goes to the common include directory.
+     Everything else is left locally"
+
+    (
+        #(
+            'stx:libbasic'        'stx:libview'         'stx:libtool'   
+            'stx:libbasic2'       'stx:libview2'        'stx:libtool2'
+            'stx:libbasic3'       'stx:libwidg'         'stx:libhtml'
+            'stx:libcomp'         'stx:libwidg2'        'stx:libui'
+        )
+    includes:self package) ifTrue:[
+        ^ '-H$(INCLUDE)'
+    ].
+    ^ '-H.'
+
+    "Created: / 18-08-2006 / 13:01:52 / cg"
 ! !
 
 !LibraryDefinition class methodsFor:'sanity checks'!
@@ -918,5 +941,5 @@
 !LibraryDefinition class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libbasic/LibraryDefinition.st,v 1.27 2006-08-18 17:15:42 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libbasic/LibraryDefinition.st,v 1.28 2006-08-18 17:19:39 cg Exp $'
 ! !