From: Stefan Metzmacher <metze@samba.org>
Date: Fri, 30 Jan 2009 16:03:10 +0000 (+0100)
Subject: s4:build: kill DEFAULT_HEADERS variable
X-Git-Tag: samba-4.0.0alpha7~417^2~246
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=94cb0835ca690cc7eb115693e672ea9a662fc671;p=thirdparty%2Fsamba.git

s4:build: kill DEFAULT_HEADERS variable

metze
---

diff --git a/lib/util/config.mk b/lib/util/config.mk
index 22f22b5771b..02f476b97b2 100644
--- a/lib/util/config.mk
+++ b/lib/util/config.mk
@@ -30,6 +30,7 @@ LIBSAMBA-UTIL_OBJ_FILES = $(addprefix $(libutilsrcdir)/, \
 		params.o)
 
 PUBLIC_HEADERS += $(addprefix $(libutilsrcdir)/, util.h \
+				 dlinklist.h
 				 attr.h \
 				 byteorder.h \
 				 data_blob.h \
diff --git a/source4/Makefile b/source4/Makefile
index 7d4540ae6a6..b342d671f67 100644
--- a/source4/Makefile
+++ b/source4/Makefile
@@ -145,12 +145,11 @@ endif
 clean::
 	@find ../lib ../libcli ../librpc ../nsswitch -name '*.o' -o -name '*.ho' | xargs rm -f
 
-DEFAULT_HEADERS = $(srcdir)/../lib/util/dlinklist.h \
-		  $(srcdir)/version.h
+PUBLIC_HEADES += $(srcdir)/version.h
 
 libraries:: $(STATIC_LIBS) $(SHARED_LIBS)
 modules:: $(PLUGINS)
-headers:: $(PUBLIC_HEADERS) $(DEFAULT_HEADERS)
+headers:: $(PUBLIC_HEADERS)
 manpages:: $(MANPAGES)
 all:: showflags $(ALL_PREDEP) binaries modules pythonmods libraries headers
 everything:: all
@@ -233,7 +232,7 @@ installlib:: $(SHARED_LIBS) $(STATIC_LIBS) installdirs
 	#@$(SHELL) $(srcdir)/script/installlib.sh $(DESTDIR)$(libdir) "$(STLIBEXT)" $(STATIC_LIBS)
 
 installheader:: headers installdirs
-	@srcdir=$(srcdir) builddir=$(builddir) $(PERL) $(srcdir)/script/installheader.pl $(DESTDIR)$(includedir) $(PUBLIC_HEADERS) $(DEFAULT_HEADERS)
+	@srcdir=$(srcdir) builddir=$(builddir) $(PERL) $(srcdir)/script/installheader.pl $(DESTDIR)$(includedir) $(PUBLIC_HEADERS)
 
 installdat:: installdirs
 	@$(SHELL) $(srcdir)/script/installdat.sh $(DESTDIR)$(datadir) $(srcdir)