Rev 8: Fix dependencies, samba-gtk builds now. in file:///home/jelmer/bzr.samba-gtk/trunk/

[Jelmer Vernooij]

At file:///home/jelmer/bzr.samba-gtk/trunk/

------------------------------------------------------------
revno: 8
revision-id: jelmer at samba.org-20070226154333-wbnwchnci4lgg28z
parent: jelmer at samba.org-20070226154300-tcq7jrxafkxe048z
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: trunk
timestamp: Mon 2007-02-26 16:43:33 +0100
message:
  Fix dependencies, samba-gtk builds now.
modified:
  .bzrignore                     bzrignore-20070212014129-w5yawhiibf6jvozn-1
  Makefile                       makefile-20070212012504-sw14j7mksqsaqr1p-1
  Makefile.settings.in           makefile.settings.in-20070212012504-sw14j7mksqsaqr1p-2
  configure.ac                   config.m4-20070212012142-xd81qmuy498gj3wa-3
  tools/gregedit.c               gregedit.c-20070212012142-xd81qmuy498gj3wa-32
=== modified file '.bzrignore'
--- a/.bzrignore	2007-02-12 11:22:23 +0000
+++ b/.bzrignore	2007-02-26 15:43:33 +0000
@@ -7,3 +7,8 @@
 gtksamba.pc
 man/*.1
 libsamba-gtk.so.0.0.1
+gepdump
+gwcrontab
+gregedit
+gwsam
+gwsvcctl

=== modified file 'Makefile'
--- a/Makefile	2007-02-26 13:13:47 +0000
+++ b/Makefile	2007-02-26 15:43:33 +0000
@@ -1,14 +1,19 @@
 include Makefile.settings
 
 BINS = gepdump gregedit gwcrontab gwsam gwsvcctl
+gepdump_LIBS = $(DCERPC_MGMT_LIBS)
+gregedit_LIBS = $(REGISTRY_LIBS)
+gwcrontab_LIBS = $(DCERPC_ATSVC_LIBS)
 CFLAGS = $(GTK_CFLAGS) $(TALLOC_CFLAGS) $(DCERPC_CFLAGS) $(GENSEC_CFLAGS) -I.
-LIBS = $(GTK_LIBS) $(TALLOC_LIBS) $(DCERPC_LIBS) $(GENSEC_LIBS) 
+LIBS = $(GTK_LIBS) $(TALLOC_LIBS) $(DCERPC_LIBS) $(GENSEC_LIBS) $(DCERPC_SAMR_LIBS)
 
 LIB = libsamba-gtk.so.0.0.1
 MANPAGES = man/gepdump.1 man/gwcrontab.1 man/gwsvcctl.1 man/gregedit.1
 
 all: $(BINS) $(LIB)
 
+Makefile: Makefile.settings
+
 install:: $(BINS) $(LIB)
 	$(INSTALL) -d $(bindir) $(libdir) $(man1dir)
 	$(INSTALL) -m 0755 $(BINS) $(bindir)
@@ -17,7 +22,7 @@
 install-doc::
 	$(INSTALL) -m 0644 $(MANPAGES) $(man1dir)
 
-configure: 
+configure: configure.ac
 	aclocal
 	autoconf -f
 
@@ -29,13 +34,15 @@
 
 $(LIB): $(patsubst %.c, %.o, $(wildcard common/*.c))
 	$(CC) -shared -o $@ $^ $(LIBS)
-	ln -s $(LIB) libsamba-gtk.so 
+
+libsamba-gtk.so: $(LIB)
+	ln -fs $< $@
 
 %.o: %.c
 	$(CC) $(CFLAGS) -o $@ -c $<
 
-$(BINS): %: tools/%.o $(LIB)
-	$(CC) -o $@ $< -lsamba-gtk -L. $(LIBS)
+$(BINS): %: tools/%.o libsamba-gtk.so
+	$(CC) -o $@ $< -lsamba-gtk -L. $(LIBS) $($*_LIBS)
 
 install::
 

=== modified file 'Makefile.settings.in'
--- a/Makefile.settings.in	2007-02-12 11:22:23 +0000
+++ b/Makefile.settings.in	2007-02-26 15:43:33 +0000
@@ -10,9 +10,21 @@
 DCERPC_CFLAGS = @DCERPC_CFLAGS@
 DCERPC_LIBS = @DCERPC_LIBS@
 
+DCERPC_SAMR_CFLAGS = @DCERPC_SAMR_CFLAGS@
+DCERPC_SAMR_LIBS = @DCERPC_SAMR_LIBS@
+
+DCERPC_MGMT_CFLAGS = @DCERPC_MGMT_CFLAGS@
+DCERPC_MGMT_LIBS = @DCERPC_MGMT_LIBS@
+
+DCERPC_ATSVC_CFLAGS = @DCERPC_ATSVC_CFLAGS@
+DCERPC_ATSVC_LIBS = @DCERPC_ATSVC_LIBS@
+
 GENSEC_CFLAGS = @GENSEC_CFLAGS@
 GENSEC_LIBS = @GENSEC_LIBS@
 
+REGISTRY_CFLAGS = @REGISTRY_CFLAGS@
+REGISTRY_LIBS = @REGISTRY_LIBS@
+
 XSLTPROC = @XSLTPROC@
 
 prefix = @prefix@

=== modified file 'configure.ac'
--- a/configure.ac	2007-02-12 11:22:23 +0000
+++ b/configure.ac	2007-02-26 15:43:33 +0000
@@ -7,6 +7,10 @@
 PKG_CHECK_MODULES(TALLOC, [talloc])
 PKG_CHECK_MODULES(DCERPC, [dcerpc])
 PKG_CHECK_MODULES(GENSEC, [gensec])
+PKG_CHECK_MODULES(DCERPC_SAMR, [dcerpc_samr])
+PKG_CHECK_MODULES(DCERPC_MGMT, [dcerpc_mgmt])
+PKG_CHECK_MODULES(DCERPC_ATSVC, [dcerpc_atsvc])
+PKG_CHECK_MODULES(REGISTRY, [registry])
 
 AC_CONFIG_FILES([Makefile.settings gtksamba.pc])
 AC_OUTPUT

=== modified file 'tools/gregedit.c'
--- a/tools/gregedit.c	2007-02-12 11:53:35 +0000
+++ b/tools/gregedit.c	2007-02-26 15:43:33 +0000
@@ -969,7 +969,6 @@
 	int ret;
 
 	lp_load();
-	setup_logging(argv[0], DEBUG_STDERR);
 
 	mem_ctx = talloc_init("gregedit");