Rev 9: Fix installation. in file:///home/jelmer/bzr.samba-gtk/trunk/

Jelmer Vernooij jelmer at samba.org
Mon Feb 26 15:57:48 GMT 2007


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

------------------------------------------------------------
revno: 9
revision-id: jelmer at samba.org-20070226155744-rod0t0uhegjyvo8q
parent: jelmer at samba.org-20070226154333-wbnwchnci4lgg28z
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: trunk
timestamp: Mon 2007-02-26 16:57:44 +0100
message:
  Fix installation.
modified:
  Makefile                       makefile-20070212012504-sw14j7mksqsaqr1p-1
  Makefile.settings.in           makefile.settings.in-20070212012504-sw14j7mksqsaqr1p-2
  gtksamba.pc.in                 gtksamba.pc-20070212012142-xd81qmuy498gj3wa-5
=== modified file 'Makefile'
--- a/Makefile	2007-02-26 15:43:33 +0000
+++ b/Makefile	2007-02-26 15:57:44 +0000
@@ -17,7 +17,8 @@
 install:: $(BINS) $(LIB)
 	$(INSTALL) -d $(bindir) $(libdir) $(man1dir)
 	$(INSTALL) -m 0755 $(BINS) $(bindir)
-	$(INSTALL) -m 0755 $(LIBDIR) $(libdir)
+	$(INSTALL) -m 0755 $(LIB) $(libdir)
+	$(INSTALL) -m 0644 gtksamba.pc $(pcdir)
 
 install-doc::
 	$(INSTALL) -m 0644 $(MANPAGES) $(man1dir)
@@ -33,7 +34,7 @@
 	./configure
 
 $(LIB): $(patsubst %.c, %.o, $(wildcard common/*.c))
-	$(CC) -shared -o $@ $^ $(LIBS)
+	$(CC) -Wl,-soname=libsamba-gtk.so.0 -shared -o $@ $^ $(LIBS)
 
 libsamba-gtk.so: $(LIB)
 	ln -fs $< $@
@@ -41,8 +42,8 @@
 %.o: %.c
 	$(CC) $(CFLAGS) -o $@ -c $<
 
-$(BINS): %: tools/%.o libsamba-gtk.so
-	$(CC) -o $@ $< -lsamba-gtk -L. $(LIBS) $($*_LIBS)
+$(BINS): %: tools/%.o $(LIB)
+	$(CC) -o $@ $< $(LIB) $(LIBS) $($*_LIBS)
 
 install::
 

=== modified file 'Makefile.settings.in'
--- a/Makefile.settings.in	2007-02-26 15:43:33 +0000
+++ b/Makefile.settings.in	2007-02-26 15:57:44 +0000
@@ -32,7 +32,10 @@
 
 bindir = @bindir@
 libdir = @libdir@
+pcdir = $(libdir)/pkgconfig
 
 datarootdir = @datarootdir@
 mandir = @mandir@
 man1dir = $(mandir)/man1
+
+INSTALL = @INSTALL@

=== modified file 'gtksamba.pc.in'
--- a/gtksamba.pc.in	2007-02-12 01:52:48 +0000
+++ b/gtksamba.pc.in	2007-02-26 15:57:44 +0000
@@ -2,7 +2,6 @@
 exec_prefix=@exec_prefix@
 libdir=@libdir@
 includedir=@includedir@
-modulesdir=${prefix}/modules/gtksamba
 
 Name: gtksamba
 Description: Common Samba-related widgets for GTK+ applications



More information about the samba-cvs mailing list