Add missing files to WINGs build and name external repos with headers differently.

bazel/WINGs/BUILD.bazel

@@ -4,20 +4,39 @@ cc_library(
         # TODO: These include paths must be kept in sync with the local
         # repository definitions in WORKSPACE. It would be better to find them
         # with pkg-config or discover them in some other automated way.
-        "-Iexternal/glib",
-        "-Iexternal/pango",
-        "-Iexternal/glib_config",
-        "-Iexternal/harfbuzz",
-        "-Iexternal/freetype2",
+        "-Iexternal/glib_h",
+        "-Iexternal/pango_h",
+        "-Iexternal/glib_config_h",
+        "-Iexternal/harfbuzz_h",
+        "-Iexternal/freetype2_h",
         "-DRESOURCE_PATH=\\\"Resources\\\"",
+        "-D_GNU_SOURCE",
     ],
     data = glob(['Resources/*']),
     srcs = [
+        "array.c",
+        "bagtree.c",
 	    "configuration.c",
+        "data.c",
 	    "dragcommon.c",
 	    "dragdestination.c",
 	    "dragsource.c",
+        "error.c",
+        "findfile.c",
+        "handlers.c",
+        "hashtable.c",
+        "memory.c",
+        "menuparser.c",
+        "menuparser_macros.c",
+        "misc.c",
+        "notification.c",
+        "proplist.c",
 	    "selection.c",
+        "string.c",
+        "tree.c",
+        "userdefaults.c",
+        "usleep.c",
+        "wapplication.c",
 	    "wappresource.c",
 	    "wballoon.c",
 	    "wbox.c",
@@ -53,6 +72,8 @@ cc_library(
 	    "wwindow.c",
     ],
     hdrs = [
+        "menuparser.h",
+        "userdefaults.h",
         "rgb.h",
 	    "wconfig.h",
         "WINGs.h",
@@ -63,10 +84,11 @@ cc_library(
         "//config",
         "//wmaker:gnustep_compat",
         "//wrlib",
-        "@freetype2//:headers",
-        "@glib//:headers",
-        "@glib_config//:headers",
-        "@harfbuzz//:headers",
-        "@pango//:headers",
+        "@freetype2_h//:headers",
+        "@glib_h//:headers",
+        "@glib_config_h//:headers",
+        "@harfbuzz_h//:headers",
+        "@pango_h//:headers",
     ],
+    visibility = ["//visibility:public"],
 )

bazel/WINGs/error.c

@@ -27,8 +27,8 @@
 #include <string.h>
 #include <unistd.h>
 
-#include <WUtil.h>
-#include <WINGsP.h>
+#include "WINGs/WUtil.h"
+#include "WINGs/WINGsP.h"
 
 #ifdef HAVE_SYSLOG_H
 #include <syslog.h>

bazel/WINGs/hashtable.c

@@ -1,11 +1,11 @@
-#include <config.h>
+#include "config/config.h"
 
 #include <sys/types.h>
 #include <string.h>
 #include <stdlib.h>
 #include <stdio.h>
 
-#include "WUtil.h"
+#include "WINGs/WUtil.h"
 
 #define INITIAL_CAPACITY	23
 

bazel/WINGs/menuparser.c

@@ -24,9 +24,9 @@
 #include <ctype.h>
 #include <stdarg.h>
 
-#include <WINGs/WUtil.h>
+#include "WINGs/WUtil.h"
 
-#include "menuparser.h"
+#include "WINGs/menuparser.h"
 
 static WMenuParser menu_parser_create_new(const char *file_name, void *file,
 					  const char *include_default_paths);

bazel/WINGs/menuparser_macros.c

@@ -26,7 +26,7 @@
 #include <unistd.h>
 #include <pwd.h>
 
-#include <WINGs/WUtil.h>
+#include "WINGs/WUtil.h"
 
 #include "menuparser.h"
 

bazel/WINGs/misc.c

@@ -20,7 +20,7 @@
 
 /* Miscelaneous helper functions */
 
-#include <WUtil.h>
+#include "WINGs/WUtil.h"
 
 #include "error.h"
 

bazel/WINGs/proplist.c

@@ -12,8 +12,8 @@
 #include <strings.h>
 #include <unistd.h>
 
-#include "WUtil.h"
-#include "wconfig.h"
+#include "WINGs/WUtil.h"
+#include "WINGs/wconfig.h"
 
 typedef enum {
 	WPLString = 0x57504c01,

bazel/WINGs/userdefaults.c

@@ -11,7 +11,7 @@
 
 #include "WINGs/WINGs.h"
 #include "WINGs/WINGsP.h"
-#include "WINGs/userdefaults.h"
+#include "userdefaults.h"
 
 
 typedef struct W_UserDefaults {

bazel/WINGs/wapplication.c

@@ -4,7 +4,7 @@
 
 #include "WINGs/WINGsP.h"
 #include "WINGs/wconfig.h"
-#include "WINGs/userdefaults.h"
+#include "userdefaults.h"
 
 
 struct W_Application WMApplication;

bazel/WINGs/wconfig.h

@@ -22,6 +22,8 @@
 
 #include "config/config.h"
 
+#include <stdlib.h>
+
 #if defined(HAVE_LIBINTL_H) && defined(I18N)
 # include <libintl.h>
 # define _(text) dgettext("WINGs", text)

bazel/WORKSPACE

@@ -4,7 +4,7 @@
 # them more easily configurable).
 
 new_local_repository(
-    name = "pango",
+    name = "pango_h",
     path = "/usr/include/pango-1.0",
     build_file_content = """
 package(default_visibility = ["//visibility:public"])
@@ -16,7 +16,7 @@ cc_library(
 )
 
 new_local_repository(
-    name = "glib",
+    name = "glib_h",
     path = "/usr/include/glib-2.0",
     build_file_content = """
 package(default_visibility = ["//visibility:public"])
@@ -28,7 +28,7 @@ cc_library(
 )
 
 new_local_repository(
-    name = "glib_config",
+    name = "glib_config_h",
     path = "/usr/lib/x86_64-linux-gnu/glib-2.0/include",
     build_file_content = """
 package(default_visibility = ["//visibility:public"])
@@ -40,7 +40,7 @@ cc_library(
 )
 
 new_local_repository(
-    name = "harfbuzz",
+    name = "harfbuzz_h",
     path = "/usr/include/harfbuzz",
     build_file_content = """
 package(default_visibility = ["//visibility:public"])
@@ -52,7 +52,7 @@ cc_library(
 )
 
 new_local_repository(
-    name = "freetype2",
+    name = "freetype2_h",
     path = "/usr/include/freetype2",
     build_file_content = """
 package(default_visibility = ["//visibility:public"])