From 5c879037562f0eae000bb0bd1ed68e9a5ebce185 Mon Sep 17 00:00:00 2001 From: Robert McQueen Date: Sun, 22 Dec 2002 05:08:52 +0000 Subject: [PATCH] 2002-12-22 Robert McQueen * makefile: when doing distclean, attempt distclean on all the C# subdirs too * gconf/Makefile.in: added distclean target to rm the Makefiles in the subdirs of gconf/ * glue/Makefile.am: build libgtksharpglue as an unversioned module to avoid so -> so.0 -> so.0.0 symlink mess * */Makefile.in: call mkinstalldirs before installing any files so that subdirs can be installed seperately or in any sequence (eg binding dirs before native dirs) svn path=/trunk/gtk-sharp/; revision=9828 --- ChangeLog | 12 ++++++++++++ art/Makefile.in | 1 + atk/Makefile.in | 1 + gconf/GConf.PropertyEditors/Makefile.in | 1 + gconf/GConf/Makefile.in | 1 + gconf/Makefile.in | 5 +++++ gconf/tools/Makefile.in | 1 + gda/Makefile.in | 1 + gdk/Makefile.in | 1 + glade/Makefile.in | 1 + glib/Makefile.in | 1 + glue/Makefile.am | 2 ++ gnome/Makefile.in | 1 + gnomedb/Makefile.in | 1 + gst/Makefile.in | 1 + gtk/Makefile.in | 1 + makefile | 1 + pango/Makefile.in | 1 + 18 files changed, 34 insertions(+) diff --git a/ChangeLog b/ChangeLog index 065c5a2ba..f8109c5a2 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,15 @@ +2002-12-22 Robert McQueen + + * makefile: when doing distclean, attempt distclean on all the + C# subdirs too + * gconf/Makefile.in: added distclean target to rm the Makefiles + in the subdirs of gconf/ + * glue/Makefile.am: build libgtksharpglue as an unversioned + module to avoid so -> so.0 -> so.0.0 symlink mess + * */Makefile.in: call mkinstalldirs before installing any files + so that subdirs can be installed seperately or in any sequence + (eg binding dirs before native dirs) + 2002-12-20 Alp Toker * api/gst-api.xml: Make Gst# link to libgstreamer.so as per pkg-config diff --git a/art/Makefile.in b/art/Makefile.in index 8cc7b7ee0..48339953d 100755 --- a/art/Makefile.in +++ b/art/Makefile.in @@ -16,5 +16,6 @@ clean: rm -rf generated install: all + ../mkinstalldirs $(DESTDIR)@prefix@/lib && \ cp art-sharp.dll $(DESTDIR)@prefix@/lib diff --git a/atk/Makefile.in b/atk/Makefile.in index 469a88a29..ba455a625 100644 --- a/atk/Makefile.in +++ b/atk/Makefile.in @@ -16,5 +16,6 @@ clean: rm -rf generated install: all + ../mkinstalldirs $(DESTDIR)@prefix@/lib && \ cp atk-sharp.dll $(DESTDIR)@prefix@/lib diff --git a/gconf/GConf.PropertyEditors/Makefile.in b/gconf/GConf.PropertyEditors/Makefile.in index 45e75d5b0..5df78083a 100644 --- a/gconf/GConf.PropertyEditors/Makefile.in +++ b/gconf/GConf.PropertyEditors/Makefile.in @@ -21,6 +21,7 @@ gconf-sharp-peditors.dll: $(SOURCES) $(MCS) $(SOURCES) -L ../../glib -L ../../pango -L ../../atk -L ../../gdk -L ../../gtk -L ../../art -L ../../gnome -L ../GConf -L ../../glade /r:glib-sharp.dll /r:pango-sharp.dll /r:atk-sharp.dll /r:gdk-sharp.dll /r:gtk-sharp.dll /r:art-sharp.dll /r:gnome-sharp.dll /r:glade-sharp.dll /r:gconf-sharp.dll /r:System.Drawing /target:library /out:gconf-sharp-peditors.dll install: all + ../../mkinstalldirs $(DESTDIR)@prefix@/lib && \ cp gconf-sharp-peditors.dll $(DESTDIR)@prefix@/lib clean: diff --git a/gconf/GConf/Makefile.in b/gconf/GConf/Makefile.in index d09fd59ea..ed40dafa0 100644 --- a/gconf/GConf/Makefile.in +++ b/gconf/GConf/Makefile.in @@ -19,6 +19,7 @@ gconf-sharp.dll: $(SOURCES) $(MCS) $(SOURCES) -L ../../glib /r:glib-sharp.dll /target:library /out:gconf-sharp.dll install: all + ../../mkinstalldirs $(DESTDIR)@prefix@/lib && \ cp gconf-sharp.dll $(DESTDIR)@prefix@/lib clean: diff --git a/gconf/Makefile.in b/gconf/Makefile.in index 52fc9c39a..041ff41be 100644 --- a/gconf/Makefile.in +++ b/gconf/Makefile.in @@ -17,3 +17,8 @@ clean: for i in $(SUBDIRS); do \ $(MAKE) -C $$i clean || exit 1; \ done + +distclean: clean + for i in $(SUBDIRS); do \ + rm -f $$i/Makefile; \ + done diff --git a/gconf/tools/Makefile.in b/gconf/tools/Makefile.in index 60b99e9e9..7fbfd2ae3 100644 --- a/gconf/tools/Makefile.in +++ b/gconf/tools/Makefile.in @@ -17,6 +17,7 @@ gconfsharp-schemagen: gconfsharp-schemagen.in && chmod +x gconfsharp-schemagen install: all + ../../mkinstalldirs $(DESTDIR)@prefix@/bin && \ chmod +x gconfsharp-schemagen && cp gconfsharp-schemagen.exe gconfsharp-schemagen $(DESTDIR)@prefix@/bin clean: diff --git a/gda/Makefile.in b/gda/Makefile.in index 2156e5f25..f886d0025 100755 --- a/gda/Makefile.in +++ b/gda/Makefile.in @@ -17,4 +17,5 @@ clean: rm -rf generated install: all +@ENABLE_GDA_TRUE@ ../mkinstalldirs $(DESTDIR)@prefix@/lib && \ @ENABLE_GDA_TRUE@ cp gda-sharp.dll $(DESTDIR)@prefix@/lib diff --git a/gdk/Makefile.in b/gdk/Makefile.in index 9c4e88ec7..109339687 100755 --- a/gdk/Makefile.in +++ b/gdk/Makefile.in @@ -16,5 +16,6 @@ clean: rm -rf generated install: all + ../mkinstalldirs $(DESTDIR)@prefix@/lib && \ cp gdk-sharp.dll $(DESTDIR)@prefix@/lib diff --git a/glade/Makefile.in b/glade/Makefile.in index 0a4d60fa8..97845c904 100755 --- a/glade/Makefile.in +++ b/glade/Makefile.in @@ -17,4 +17,5 @@ clean: rm -rf generated install: all +@ENABLE_GLADE_TRUE@ ../mkinstalldirs $(DESTDIR)@prefix@/lib && \ @ENABLE_GLADE_TRUE@ cp glade-sharp.dll $(DESTDIR)@prefix@/lib diff --git a/glib/Makefile.in b/glib/Makefile.in index ef8c2b18c..b14d9829f 100755 --- a/glib/Makefile.in +++ b/glib/Makefile.in @@ -16,5 +16,6 @@ clean: rm -rf generated install: all + ../mkinstalldirs $(DESTDIR)@prefix@/lib && \ cp glib-sharp.dll $(DESTDIR)@prefix@/lib || exit 1 diff --git a/glue/Makefile.am b/glue/Makefile.am index 190be94e7..c29be9616 100644 --- a/glue/Makefile.am +++ b/glue/Makefile.am @@ -29,6 +29,8 @@ GNOMESOURCES = \ program.c \ # +libgtksharpglue_la_LDFLAGS = -module -avoid-version + # fixme: Makefile.am = THE SUCK if ENABLE_GNOME diff --git a/gnome/Makefile.in b/gnome/Makefile.in index baa798053..8be79d32a 100755 --- a/gnome/Makefile.in +++ b/gnome/Makefile.in @@ -17,5 +17,6 @@ clean: rm -rf generated install: all +@ENABLE_GNOME_TRUE@ ../mkinstalldirs $(DESTDIR)@prefix@/lib && \ @ENABLE_GNOME_TRUE@ cp gnome-sharp.dll $(DESTDIR)@prefix@/lib diff --git a/gnomedb/Makefile.in b/gnomedb/Makefile.in index 1de69b76a..0d929d031 100755 --- a/gnomedb/Makefile.in +++ b/gnomedb/Makefile.in @@ -17,4 +17,5 @@ clean: rm -rf generated install: all +@ENABLE_GNOMEDB_TRUE@ ../mkinstalldirs $(DESTDIR)@prefix@/lib && \ @ENABLE_GNOMEDB_TRUE@ cp gnomedb-sharp.dll $(DESTDIR)@prefix@/lib diff --git a/gst/Makefile.in b/gst/Makefile.in index c20b9638c..58879f264 100755 --- a/gst/Makefile.in +++ b/gst/Makefile.in @@ -16,5 +16,6 @@ clean: rm -rf generated install: all + ../mkinstalldirs $(DESTDIR)@prefix@/lib && \ cp gst-sharp.dll $(DESTDIR)@prefix@/lib || exit 1 diff --git a/gtk/Makefile.in b/gtk/Makefile.in index a67f0bb29..914661a3d 100755 --- a/gtk/Makefile.in +++ b/gtk/Makefile.in @@ -16,5 +16,6 @@ clean: rm -rf generated install: all + ../mkinstalldirs $(DESTDIR)@prefix@/lib && \ cp gtk-sharp.dll $(DESTDIR)@prefix@/lib diff --git a/makefile b/makefile index 52f7276f1..df3f304c4 100644 --- a/makefile +++ b/makefile @@ -37,6 +37,7 @@ distclean: clean $(MAKE) -C $$i distclean || exit 1; \ done for i in $(DIRS); do \ + $(MAKE) -C $$i distclean || true; \ rm -f $$i/Makefile; \ done rm -f config.cache config.h config.log config.status libtool diff --git a/pango/Makefile.in b/pango/Makefile.in index 2ccbda139..dd15ee659 100644 --- a/pango/Makefile.in +++ b/pango/Makefile.in @@ -16,5 +16,6 @@ clean: rm -rf generated install: all + ../mkinstalldirs $(DESTDIR)@prefix@/lib && \ cp pango-sharp.dll $(DESTDIR)@prefix@/lib