xxxx

Author: thom311

Makefile.am

@@ -346,6 +346,28 @@ noinst_HEADERS = \
 
 ###############################################################################
 
+default_includes = \
+	-I$(srcdir)/include/linux-private \
+	-I$(srcdir)/include \
+	-I$(builddir)/include \
+	-I$(srcdir)/third_party/c-list/src \
+	$(NULL)
+
+default_cppflags = \
+	$(extra_cppflags) \
+	$(warn_cppflags) \
+	$(defines_cppflags) \
+	$(default_includes) \
+	$(NULL)
+
+###############################################################################
+
+lib_cppflags = \
+	$(default_cppflags) \
+	$(NULL)
+
+###############################################################################
+
 # Hack to avoid using ylwrap. It does not function correctly in combination
 # with --header-file=
 
@@ -382,6 +404,18 @@ grammar_files_sources = \
 
 grammar_files_headers = $(grammar_files_sources:%.c=%.h)
 
+noinst_LTLIBRARIES += lib/route/libnl-grammar.la
+
+nodist_lib_route_libnl_grammar_la_SOURCES = \
+	$(grammar_files_sources)
+lib_route_libnl_grammar_la_CPPFLAGS = \
+	$(lib_cppflags) \
+	-I$(srcdir)/lib/route \
+	-Wno-unused-but-set-variable \
+	$(NULL)
+
+$(lib_route_libnl_grammar_la_OBJECTS): $(grammar_files_headers)
+
 CLEANFILES += \
 	$(grammar_files_sources) \
 	$(grammar_files_headers)
@@ -395,26 +429,6 @@ EXTRA_DIST += \
 
 ###############################################################################
 
-default_includes = \
-	-I$(srcdir)/include/linux-private \
-	-I$(srcdir)/include \
-	-I$(builddir)/include \
-	-I$(srcdir)/third_party/c-list/src \
-	$(NULL)
-
-default_cppflags = \
-	$(extra_cppflags) \
-	$(warn_cppflags) \
-	$(defines_cppflags) \
-	$(default_includes) \
-	$(NULL)
-
-###############################################################################
-
-lib_cppflags = \
-	$(default_cppflags) \
-	$(NULL)
-
 lib_LTLIBRARIES += lib/libnl-3.la
 
 lib_libnl_3_la_SOURCES = \
@@ -540,8 +554,6 @@ lib_libnl_route_3_la_SOURCES = \
 	lib/route/tc-api.h \
 	lib/route/tc.c \
 	$(NULL)
-nodist_lib_libnl_route_3_la_SOURCES = \
-	$(grammar_files_sources)
 EXTRA_lib_libnl_route_3_la_DEPENDENCIES = \
 	libnl-route-3.sym
 lib_libnl_route_3_la_CPPFLAGS = \
@@ -554,7 +566,9 @@ lib_libnl_route_3_la_LDFLAGS = \
 	-version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) \
 	-Wl,--version-script=$(srcdir)/libnl-route-3.sym
 lib_libnl_route_3_la_LIBADD = \
-	lib/libnl-3.la
+	lib/libnl-3.la \
+	lib/route/libnl-grammar.la \
+	$(NULL)
 
 $(lib_libnl_route_3_la_OBJECTS): $(grammar_files_headers)
 

tests/nl-test-util.c

@@ -149,14 +149,14 @@ static void unshare_user(void)
 	}
 	r = fprintf(f, "0 %d 1", uid);
 	_nltst_assert_errno(r > 0);
-	_nltst_fclose(f);
+	//_nltst_fclose(f);
 
 	/* Map current GID to root in NS to be created. */
 	f = fopen("/proc/self/gid_map", "we");
 	_nltst_assert_errno(f);
 	r = fprintf(f, "0 %d 1", gid);
 	_nltst_assert_errno(r > 0);
-	_nltst_fclose(f);
+	//_nltst_fclose(f);
 }
 
 struct nltst_netns *nltst_netns_enter(void)