merge soc07 r4819 - Put NMAP_VERSION in nmap.h only and have the makefiles grep it from there

nmapfe/nmapfe.c

@@ -428,6 +428,7 @@ GtkAdjustment *adjust;
 #ifdef WIN32
   opt.isr00t = 1;
   /* for nmap version */
+#include "nmap.h"
 #include "nmap_winconfig.h"
 #define VERSION NMAP_VERSION
 #else

nmapfe/nmapfe.h

@@ -109,8 +109,8 @@
  * Long live Aol and pr: Phreak. <grins>
  */
 
-#ifndef NMAP_H
-#define NMAP_H
+#ifndef NMAPFE_H
+#define NMAPFE_H
 
 #if MISSING_GTK
 #error "Your system does not appear to have GTK (www.gtk.org) installed.  Thus the Nmap X Front End will not compile.  You should still be able to use Nmap the normal way (via text console).  GUIs are for wimps anyway :)"
@@ -307,4 +307,4 @@ GtkWidget* create_main_win (void);
 GtkWidget* create_fileSelection(const char *title, char *filename, void (*action)(), GtkEntry *entry);
 GtkWidget* create_helpDialog(void);
 
-#endif /* NMAP_H */
+#endif /* NMAPFE_H */