From: Peter g. <pg...@co...> - 2009-01-28 17:54:18
|
Sun Jan 25 15:59:28 EST 2009 Peter Gavin <pg...@gm...> * Makefile.am: clean up and add some dependencies hunk ./Makefile.am 298 -glib/libHSglib_a.deps : $(libHSglib_a_HSFILES) - hunk ./Makefile.am 379 +glib/libHSglib_a.deps: $(libHSglib_a_HSFILES) | \ + $(foreach pkg,$(libHSglib_a_INTERNALDEPS),$(pkg)/libHS$(pkg)_a.deps) +$(libHSglib_a_CHSFILES:.chs=.dep): \ + $(foreach pkg,glib $(libHSglib_a_INTERNALDEPS),$(libHS$(pkg)_a_CHSFILES)) hunk ./Makefile.am 384 +$(libHSglib_a_OBJECTS) : \ + $(foreach pkg,$(libHSglib_a_INTERNALDEPS),$(libHS$(pkg)_a_OBJECTS)) hunk ./Makefile.am 448 -gio/libHSgio_a.deps : $(libHSgio_a_HSFILES) | glib/libHSglib_a.deps - hunk ./Makefile.am 497 -$(libHSgio_a_OBJECTS) : $(libHSglib_a_OBJECTS) hunk ./Makefile.am 534 +gio/libHSgio_a.deps: $(libHSgio_a_HSFILES) | \ + $(foreach pkg,$(libHSgio_a_INTERNALDEPS),$(pkg)/libHS$(pkg)_a.deps) +$(libHSgio_a_CHSFILES:.chs=.dep): \ + $(foreach pkg,gio $(libHSgio_a_INTERNALDEPS),$(libHS$(pkg)_a_CHSFILES)) hunk ./Makefile.am 539 -$(libHSgio_a_CHSFILES:.chs=.dep) : \ - $(libHSgio_a_GENERATEDSOURCES) +$(libHSgio_a_OBJECTS) : \ + $(foreach pkg,$(libHSgio_a_INTERNALDEPS),$(libHS$(pkg)_a_OBJECTS)) hunk ./Makefile.am 598 -$(libHSgtk_a_PRECOMP): $(libHSgtk_a_HEADER) hunk ./Makefile.am 605 -gtk/libHSgtk_a.deps : $(libHSgtk_a_HSFILES) | glib/libHSglib_a.deps - hunk ./Makefile.am 607 -gtk/libHSgtk_a.deps : | cairo/libHScairo_a.deps hunk ./Makefile.am 911 -$(libHSgtk_a_OBJECTS) : $(libHSgtk_a_objects_deps) hunk ./Makefile.am 946 -$(libHSgtk_a_CHSFILES_HS): $(libHSgtk_a_PRECOMP) -$(libHSgtk_a_CHSFILES:.chs=.dep) : $(libHSgtk_a_GENERATEDSOURCES) +$(libHSgtk_a_PRECOMP): $(libHSgtk_a_HEADER) +gtk/libHSgtk_a.deps: $(libHSgtk_a_HSFILES) | \ + $(foreach pkg,$(libHSgtk_a_INTERNALDEPS),$(pkg)/libHS$(pkg)_a.deps) +$(libHSgtk_a_CHSFILES:.chs=.dep): \ + $(foreach pkg,gtk $(libHSgtk_a_INTERNALDEPS),$(libHS$(pkg)_a_CHSFILES)) +$(libHSgtk_a_CHSFILES_HS): $(libHSgtk_a_PRECOMP) $(libHSgtk_a_HEADER) +$(libHSgtk_a_HSCFILES_HS): $(libHSgtk_a_HEADER) +$(libHSgtk_a_OBJECTS) : \ + $(foreach pkg,$(libHSgtk_a_INTERNALDEPS),$(libHS$(pkg)_a_OBJECTS)) hunk ./Makefile.am 1016 -glade/libHSglade_a.deps : $(libHSglade_a_HSFILES) | gtk/libHSgtk_a.deps - hunk ./Makefile.am 1042 -$(libHSglade_a_OBJECTS) : $(libHSglib_a_OBJECTS) $(libHSgtk_a_OBJECTS) hunk ./Makefile.am 1072 +glade/libHSglade_a.deps: $(libHSglade_a_HSFILES) | \ + $(foreach pkg,$(libHSglade_a_INTERNALDEPS),$(pkg)/libHS$(pkg)_a.deps) +$(libHSglade_a_CHSFILES:.chs=.dep): \ + $(foreach pkg,glade $(libHSglib_a_INTERNALDEPS),$(libHS$(pkg)_a_CHSFILES)) hunk ./Makefile.am 1077 -$(libHSglade_a_CHSFILES:.chs=.dep) : \ - $(libHSgtk_a_GENERATEDSOURCES) \ - $(libHSglade_a_GENERATEDSOURCES) +$(libHSglade_a_OBJECTS) : \ + $(foreach pkg,$(libHSglade_a_INTERNALDEPS),$(libHS$(pkg)_a_OBJECTS)) hunk ./Makefile.am 1144 -gconf/libHSgconf_a.deps : $(libHSgconf_a_HSFILES) | glib/libHSglib_a.deps - hunk ./Makefile.am 1188 -$(libHSgconf_a_OBJECTS) : $(libHSglib_a_OBJECTS) hunk ./Makefile.am 1222 +gconf/libHSgconf_a.deps: $(libHSgconf_a_HSFILES) | \ + $(foreach pkg,$(libHSgconf_a_INTERNALDEPS),$(pkg)/libHS$(pkg)_a.deps) +$(libHSgconf_a_CHSFILES:.chs=.dep): \ + $(foreach pkg,gconf $(libHSgconf_a_INTERNALDEPS),$(libHS$(pkg)_a_CHSFILES)) hunk ./Makefile.am 1227 -$(libHSgconf_a_CHSFILES:.chs=.dep) : \ - $(libHSgconf_a_GENERATEDSOURCES) +$(libHSgconf_a_OBJECTS) : \ + $(foreach pkg,$(libHSgconf_a_INTERNALDEPS),$(libHS$(pkg)_a_OBJECTS)) hunk ./Makefile.am 1289 -sourceview/libHSsourceview_a.deps : $(libHSsourceview_a_HSFILES) | gtk/libHSgtk_a.deps - hunk ./Makefile.am 1326 -$(libHSsourceview_a_OBJECTS) : $(libHSglib_a_OBJECTS) $(libHSgtk_a_OBJECTS) hunk ./Makefile.am 1356 +sourceview/libHSsourceview_a.deps: $(libHSsourceview_a_HSFILES) | \ + $(foreach pkg,$(libHSsourceview_a_INTERNALDEPS),$(pkg)/libHS$(pkg)_a.deps) +$(libHSsourceview_a_CHSFILES:.chs=.dep): \ + $(foreach pkg,sourceview $(libHSsourceview_a_INTERNALDEPS),$(libHS$(pkg)_a_CHSFILES)) hunk ./Makefile.am 1361 -$(libHSsourceview_a_CHSFILES:.chs=.dep) : \ - $(libHSgtk_a_GENERATEDSOURCES) \ - $(libHSsourceview_a_GENERATEDSOURCES) +$(libHSsourceview_a_OBJECTS) : \ + $(foreach pkg,$(libHSsourceview_a_INTERNALDEPS),$(libHS$(pkg)_a_OBJECTS)) hunk ./Makefile.am 1423 -gtksourceview2/libHSgtksourceview2_a.deps : $(libHSgtksourceview2_a_HSFILES) | gtk/libHSgtk_a.deps - hunk ./Makefile.am 1476 -$(libHSgtksourceview2_a_OBJECTS) : $(libHSglib_a_OBJECTS) $(libHSgtk_a_OBJECTS) hunk ./Makefile.am 1506 +gtksourceview2/libHSgtksourceview2_a.deps: $(libHSgtksourceview2_a_HSFILES) | \ + $(foreach pkg,$(libHSgtksourceview2_a_INTERNALDEPS),$(pkg)/libHS$(pkg)_a.deps) +$(libHSgtksourceview2_a_CHSFILES:.chs=.dep): \ + $(foreach pkg,gtksourceview2 $(libHSgtksourceview2_a_INTERNALDEPS),$(libHS$(pkg)_a_CHSFILES)) hunk ./Makefile.am 1511 -$(libHSgtksourceview2_a_CHSFILES:.chs=.dep) : \ - $(libHSgtk_a_GENERATEDSOURCES) \ - $(libHSgtksourceview2_a_GENERATEDSOURCES) +$(libHSgtksourceview2_a_OBJECTS) : \ + $(foreach pkg,$(libHSgtksourceview2_a_INTERNALDEPS),$(libHS$(pkg)_a_OBJECTS)) hunk ./Makefile.am 1573 -mozembed/libHSmozembed_a.deps : $(libHSmozembed_a_HSFILES) | gtk/libHSgtk_a.deps - hunk ./Makefile.am 1599 -$(libHSmozembed_a_OBJECTS) : $(libHSglib_a_OBJECTS) $(libHSgtk_a_OBJECTS) hunk ./Makefile.am 1628 +mozembed/libHSmozembed_a.deps: $(libHSmozembed_a_HSFILES) | \ + $(foreach pkg,$(libHSmozembed_a_INTERNALDEPS),$(pkg)/libHS$(pkg)_a.deps) +$(libHSmozembed_a_CHSFILES:.chs=.dep): \ + $(foreach pkg,mozembed $(libHSmozembed_a_INTERNALDEPS),$(libHS$(pkg)_a_CHSFILES)) hunk ./Makefile.am 1633 -$(libHSmozembed_a_CHSFILES:.chs=.dep) : \ - $(libHSgtk_a_GENERATEDSOURCES) \ - $(libHSmozembed_a_GENERATEDSOURCES) +$(libHSmozembed_a_OBJECTS) : \ + $(foreach pkg,$(libHSmozembed_a_INTERNALDEPS),$(libHS$(pkg)_a_OBJECTS)) hunk ./Makefile.am 1698 -cairo/libHScairo_a.deps: $(libHScairo_a_HSFILES) | glib/libHSglib_a.deps - hunk ./Makefile.am 1744 -$(libHScairo_a_OBJECTS) : $(libHSglib_a_OBJECTS) hunk ./Makefile.am 1774 -$(libHScairo_a_CHSFILES_HS): $(libHScairo_a_PRECOMP) +$(libHScairo_a_PRECOMP): $(libHScairo_a_HEADER) +cairo/libHScairo_a.deps: $(libHScairo_a_HSFILES) | \ + $(foreach pkg,$(libHScairo_a_INTERNALDEPS),$(pkg)/libHS$(pkg)_a.deps) +$(libHScairo_a_CHSFILES:.chs=.dep): \ + $(foreach pkg,cairo $(libHScairo_a_INTERNALDEPS),$(libHS$(pkg)_a_CHSFILES)) +$(libHScairo_a_CHSFILES_HS): $(libHScairo_a_PRECOMP) $(libHScairo_a_HEADER) +$(libHScairo_a_HSCFILES_HS): $(libHScairo_a_HEADER) +$(libHScairo_a_OBJECTS) : \ + $(foreach pkg,$(libHScairo_a_INTERNALDEPS),$(libHS$(pkg)_a_OBJECTS)) hunk ./Makefile.am 1843 -svgcairo/libHSsvgcairo_a.deps: $(libHSsvgcairo_a_HSFILES) | cairo/libHScairo_a.deps - hunk ./Makefile.am 1854 -$(libHSsvgcairo_a_OBJECTS) : $(libHSglib_a_OBJECTS) $(libHScairo_a_OBJECTS) hunk ./Makefile.am 1884 -$(libHSsvgcairo_a_CHSFILES_HS): $(libHSsvgcairo_a_PRECOMP) +$(libHSsvgcairo_a_PRECOMP): $(libHSsvgcairo_a_HEADER) +svgcairo/libHSsvgcairo_a.deps: $(libHSsvgcairo_a_HSFILES) | \ + $(foreach pkg,$(libHSsvgcairo_a_INTERNALDEPS),$(pkg)/libHS$(pkg)_a.deps) +$(libHSsvgcairo_a_CHSFILES:.chs=.dep): \ + $(foreach pkg,svgcairo $(libHSsvgcairo_a_INTERNALDEPS),$(libHS$(pkg)_a_CHSFILES)) +$(libHSsvgcairo_a_CHSFILES_HS): $(libHSsvgcairo_a_PRECOMP) $(libHSsvgcairo_a_HEADER) +$(libHSsvgcairo_a_HSCFILES_HS): $(libHSsvgcairo_a_HEADER) +$(libHSsvgcairo_a_OBJECTS) : \ + $(foreach pkg,$(libHSsvgcairo_a_INTERNALDEPS),$(libHS$(pkg)_a_OBJECTS)) hunk ./Makefile.am 1953 -gtkglext/libHSgtkglext_a.deps : $(libHSgtkglext_a_HSFILES) | gtk/libHSgtk_a.deps - hunk ./Makefile.am 1986 -$(libHSgtkglext_a_OBJECTS) : $(libHSglib_a_OBJECTS) $(libHSgtk_a_OBJECTS) hunk ./Makefile.am 2016 +gtkglext/libHSgtkglext_a.deps: $(libHSgtkglext_a_HSFILES) | \ + $(foreach pkg,$(libHSgtkglext_a_INTERNALDEPS),$(pkg)/libHS$(pkg)_a.deps) +$(libHSgtkglext_a_CHSFILES:.chs=.dep): \ + $(foreach pkg,gtkglext $(libHSgtkglext_a_INTERNALDEPS),$(libHS$(pkg)_a_CHSFILES)) hunk ./Makefile.am 2021 -$(libHSgtkglext_a_CHSFILES:.chs=.dep) : \ - $(libHSgtk_a_GENERATEDSOURCES) \ - $(libHSgtkglext_a_GENERATEDSOURCES) +$(libHSgtkglext_a_OBJECTS) : \ + $(foreach pkg,$(libHSgtkglext_a_INTERNALDEPS),$(libHS$(pkg)_a_OBJECTS)) hunk ./Makefile.am 2085 -soegtk/libHSsoegtk_a.deps : $(libHSsoegtk_a_HSFILES) | gtk/libHSgtk_a.deps - hunk ./Makefile.am 2088 -gtk/libHSsoegtk_a.deps : cairo/libHScairo_a.deps hunk ./Makefile.am 2095 -$(libHSsoegtk_a_OBJECTS) : $(libHSglib_a_OBJECTS) $(libHSgtk_a_OBJECTS) hunk ./Makefile.am 2109 +soegtk/libHSsoegtk_a.deps : cairo/libHScairo_a.deps +$(libHSsoegtk_a_OBJECTS) : \ + $(foreach pkg,$(libHSsoegtk_a_INTERNALDEPS),$(libHS$(pkg)_a_OBJECTS)) + hunk ./Makefile.am 2167 -$(libHSgnomevfs_a_PRECOMP): $(libHSgnomevfs_a_HEADER) hunk ./Makefile.am 2187 -gnomevfs/libHSgnomevfs_a.deps : $(libHSgnomevfs_a_HSFILES) glib/libHSglib_a.deps - hunk ./Makefile.am 2251 -$(libHSgnomevfs_a_OBJECTS) : $(libHSglib_a_OBJECTS) hunk ./Makefile.am 2286 -$(libHSgnomevfs_a_CHSFILES_HS): $(libHSgnomevfs_a_PRECOMP) -$(libHSgnomevfs_a_CHSFILES:.chs=.dep) : \ - $(libHSgnomevfs_a_GENERATEDSOURCES) +$(libHSgnomevfs_a_PRECOMP): $(libHSgnomevfs_a_HEADER) +gnomevfs/libHSgnomevfs_a.deps: $(libHSgnomevfs_a_HSFILES) | \ + $(foreach pkg,$(libHSgnomevfs_a_INTERNALDEPS),$(pkg)/libHS$(pkg)_a.deps) +$(libHSgnomevfs_a_CHSFILES:.chs=.dep): \ + $(foreach pkg,gnomevfs $(libHSgnomevfs_a_INTERNALDEPS),$(libHS$(pkg)_a_CHSFILES)) +$(libHSgnomevfs_a_CHSFILES_HS): $(libHSgnomevfs_a_PRECOMP) $(libHSgnomevfs_a_HEADER) +$(libHSgnomevfs_a_HSCFILES_HS): $(libHSgnomevfs_a_HEADER) +$(libHSgnomevfs_a_OBJECTS) : \ + $(foreach pkg,$(libHSgnomevfs_a_INTERNALDEPS),$(libHS$(pkg)_a_OBJECTS)) hunk ./Makefile.am 2352 -$(libHSgstreamer_a_PRECOMP): $(libHSgstreamer_a_HEADER) hunk ./Makefile.am 2369 -gstreamer/libHSgstreamer_a.deps : $(libHSgstreamer_a_HSFILES) | glib/libHSglib_a.deps - hunk ./Makefile.am 2557 -$(libHSgstreamer_a_OBJECTS) : $(libHSglib_a_OBJECTS) hunk ./Makefile.am 2592 -$(libHSgstreamer_a_CHSFILES_HS): $(libHSgstreamer_a_PRECOMP) -$(libHSgstreamer_a_CHSFILES:.chs=.dep) : \ - $(libHSgstreamer_a_GENERATEDSOURCES) +$(libHSgstreamer_a_PRECOMP): $(libHSgstreamer_a_HEADER) +gstreamer/libHSgstreamer_a.deps: $(libHSgstreamer_a_HSFILES) | \ + $(foreach pkg,$(libHSgstreamer_a_INTERNALDEPS),$(pkg)/libHS$(pkg)_a.deps) +$(libHSgstreamer_a_CHSFILES:.chs=.dep): \ + $(foreach pkg,gstreamer $(libHSgstreamer_a_INTERNALDEPS),$(libHS$(pkg)_a_CHSFILES)) +$(libHSgstreamer_a_CHSFILES_HS): $(libHSgstreamer_a_PRECOMP) $(libHSgstreamer_a_HEADER) +$(libHSgstreamer_a_HSCFILES_HS): $(libHSgstreamer_a_HEADER) +$(libHSgstreamer_a_OBJECTS) : \ + $(foreach pkg,$(libHSgstreamer_a_INTERNALDEPS),$(libHS$(pkg)_a_OBJECTS)) |