Mercurial > pidgin.yaz
changeset 14461:841ce6b110a8
[gaim-migrate @ 17175]
A couple mingw makefile tweaks from Lee Roach and some cleanup from me.
committer: Tailor Script <tailor@pidgin.im>
| author | Daniel Atallah <daniel.atallah@gmail.com> |
|---|---|
| date | Wed, 06 Sep 2006 03:01:57 +0000 |
| parents | 040dfd49107d |
| children | 34a5709ff951 |
| files | Makefile.mingw gtk/pixmaps/Makefile.mingw gtk/pixmaps/smileys/default/Makefile.mingw gtk/pixmaps/smileys/none/Makefile.mingw gtk/pixmaps/status/default/Makefile.mingw gtk/sounds/Makefile.mingw libgaim/win32/global.mak libgaim/win32/targets.mak |
| diffstat | 8 files changed, 12 insertions(+), 31 deletions(-) [+] |
line wrap: on
line diff
--- a/Makefile.mingw Wed Sep 06 02:33:25 2006 +0000 +++ b/Makefile.mingw Wed Sep 06 03:01:57 2006 +0000 @@ -59,7 +59,6 @@ $(MAKE) -C $(GAIM_LIB_TOP) -f $(GAIM_WIN32_MAKEFILE) clean rm -rf $(GAIM_CONFIG_H) rm -rf gaim*.exe - rm -rf $(GAIM_INSTALL_PERLMOD_DIR) $(GAIM_INSTALL_PIXMAPS_DIR) $(GAIM_INSTALL_PLUGINS_DIR) - rm -rf $(GAIM_INSTALL_PO_DIR) $(GAIM_INSTALL_SOUNDS_DIR) $(GAIM_INSTALL_DIR) + rm -rf $(GAIM_INSTALL_PERLMOD_DIR) $(GAIM_INSTALL_PLUGINS_DIR) $(GAIM_INSTALL_PO_DIR) $(GAIM_INSTALL_DIR) include $(GAIM_COMMON_TARGETS)
--- a/gtk/pixmaps/Makefile.mingw Wed Sep 06 02:33:25 2006 +0000 +++ b/gtk/pixmaps/Makefile.mingw Wed Sep 06 03:01:57 2006 +0000 @@ -7,13 +7,13 @@ GAIM_TOP := ../.. include $(GAIM_TOP)/libgaim/win32/global.mak -datadir = $(GAIM_INSTALL_DIR) +datadir := $(GAIM_INSTALL_DIR) include ./Makefile.am install: if test '$(SUBDIRS)'; then \ list='$(SUBDIRS)'; for subdir in $$list; do \ - $(MAKE) -C $$subdir -f Makefile.mingw install; \ + $(MAKE) -C $$subdir -f $(GAIM_WIN32_MAKEFILE) install; \ done; \ fi; if test '$(gaimbuttonpix_DATA)'; then \
--- a/gtk/pixmaps/smileys/default/Makefile.mingw Wed Sep 06 02:33:25 2006 +0000 +++ b/gtk/pixmaps/smileys/default/Makefile.mingw Wed Sep 06 03:01:57 2006 +0000 @@ -11,11 +11,6 @@ include ./Makefile.am install: - if test '$(SUBDIRS)'; then \ - list='$(SUBDIRS)'; for subdir in $$list; do \ - $(MAKE) -C $$subdir -f Makefile.mingw install; \ - done; \ - fi; if test '$(gaimsmileypix_DATA)'; then \ mkdir -p $(gaimsmileypixdir); \ cp $(gaimsmileypix_DATA) $(gaimsmileypixdir); \
--- a/gtk/pixmaps/smileys/none/Makefile.mingw Wed Sep 06 02:33:25 2006 +0000 +++ b/gtk/pixmaps/smileys/none/Makefile.mingw Wed Sep 06 03:01:57 2006 +0000 @@ -11,11 +11,6 @@ include ./Makefile.am install: - if test '$(SUBDIRS)'; then \ - list='$(SUBDIRS)'; for subdir in $$list; do \ - $(MAKE) -C $$subdir -f Makefile.mingw install; \ - done; \ - fi; if test '$(gaimsmileypix_DATA)'; then \ mkdir -p $(gaimsmileypixdir); \ cp $(gaimsmileypix_DATA) $(gaimsmileypixdir); \
--- a/gtk/pixmaps/status/default/Makefile.mingw Wed Sep 06 02:33:25 2006 +0000 +++ b/gtk/pixmaps/status/default/Makefile.mingw Wed Sep 06 03:01:57 2006 +0000 @@ -11,11 +11,6 @@ include ./Makefile.am install: - if test '$(SUBDIRS)'; then \ - list='$(SUBDIRS)'; for subdir in $$list; do \ - $(MAKE) -C $$subdir -f Makefile.mingw install; \ - done; \ - fi; if test '$(gaimstatuspix_DATA)'; then \ mkdir -p $(gaimstatuspixdir); \ cp $(gaimstatuspix_DATA) $(gaimstatuspixdir); \
--- a/gtk/sounds/Makefile.mingw Wed Sep 06 02:33:25 2006 +0000 +++ b/gtk/sounds/Makefile.mingw Wed Sep 06 03:01:57 2006 +0000 @@ -1,14 +1,18 @@ # # Makefile.mingw # -# Description: Makefile for win32 (mingw) version of Gaim +# Description: Makefile for win32 (mingw) version of Gaim sounds # GAIM_TOP := ../.. include $(GAIM_TOP)/libgaim/win32/global.mak -include $(GAIM_GTK_SOUNDS_TOP)/Makefile.am + +datadir := $(GAIM_INSTALL_DIR) +include ./Makefile.am -install: $(GAIM_INSTALL_SOUNDS_DIR) - cp $(EXTRA_DIST) $(GAIM_INSTALL_SOUNDS_DIR) +install: + if test '$(sounds_DATA)'; then \ + mkdir -p $(soundsdir); \ + cp $(sounds_DATA) $(soundsdir); \ + fi; -include $(GAIM_COMMON_TARGETS)
--- a/libgaim/win32/global.mak Wed Sep 06 02:33:25 2006 +0000 +++ b/libgaim/win32/global.mak Wed Sep 06 03:01:57 2006 +0000 @@ -23,10 +23,8 @@ # Where we installing this stuff to? GAIM_INSTALL_DIR := $(GAIM_TOP)/win32-install-dir GAIM_INSTALL_PERLMOD_DIR := $(GAIM_INSTALL_DIR)/perlmod -GAIM_INSTALL_PIXMAPS_DIR := $(GAIM_INSTALL_DIR)/pixmaps GAIM_INSTALL_PLUGINS_DIR := $(GAIM_INSTALL_DIR)/plugins GAIM_INSTALL_PO_DIR := $(GAIM_INSTALL_DIR)/locale -GAIM_INSTALL_SOUNDS_DIR := $(GAIM_INSTALL_DIR)/sounds # Important (enough) locations in our source code GAIM_LIB_TOP := $(GAIM_TOP)/libgaim
--- a/libgaim/win32/targets.mak Wed Sep 06 02:33:25 2006 +0000 +++ b/libgaim/win32/targets.mak Wed Sep 06 03:01:57 2006 +0000 @@ -36,11 +36,6 @@ $(GAIM_INSTALL_PLUGINS_DIR): mkdir -p $(GAIM_INSTALL_PLUGINS_DIR) -$(GAIM_INSTALL_PIXMAPS_DIR): - mkdir -p $(GAIM_INSTALL_PIXMAPS_DIR) - $(GAIM_INSTALL_PO_DIR): mkdir -p $(GAIM_INSTALL_PO_DIR) -$(GAIM_INSTALL_SOUNDS_DIR): - mkdir -p $(GAIM_INSTALL_SOUNDS_DIR)