Changeset 3a1729a4dc1909e928808b505d048ab3eeaec864

Show
Ignore:
Timestamp:
10/17/08 03:33:08 (5 years ago)
Author:
Armin Burgmeier <armin@…>
Parents:
0cc2b2338365ee1e27aa8db0abd654f1a8a9e199
Children:
2dd07d2baf3203cea43763ce4fc58959077b4916
git-committer:
Armin Burgmeier <armin@arbur.net> / 2008-10-17T03:33:08Z+0200
Message:

`make distcheck' and parallel installation fixes

2008-10-16 Armin Burgmeier <armin@…>

  • code/Makefile.am:
  • code/commands/Makefile.am:
  • code/core/Makefile.am:
  • code/dialogs/Makefile.am:
  • code/operations/Makefile.am:
  • code/util/Makefile.am: Fix `make distcheck' by using -I$(top_srcdir) instead of a relative path such as -I.. Also, changed pixmapdir to $(datadir)/pixmaps/gobby-0.5.
  • pixmaps/Makefile.am:
  • pixmaps/gobby-0.5.png: Moved from pixmaps/gobby.png.
  • contrib/Makefile.am:
  • contrib/gobby-0.5.desktop: Moved from gobby.desktop.
  • configure.ac: Changed GETTEXT_PACKAGE from gobby to gobby05.
  • code/core/iconmanager.cpp: Load gobby-0.5.png for the Gobby logo instead of gobby.png.
Files:
11 modified
2 moved

Legend:

Unmodified
Added
Removed

  • ChangeLog

    rbc23c4d r3a1729a  
     12008-10-16  Armin Burgmeier  <armin@arbur.net> 
     2 
     3        * code/Makefile.am: 
     4        * code/commands/Makefile.am: 
     5        * code/core/Makefile.am: 
     6        * code/dialogs/Makefile.am: 
     7        * code/operations/Makefile.am: 
     8        * code/util/Makefile.am: Fix `make distcheck' by using -I$(top_srcdir) 
     9        instead of a relative path such as -I.. Also, changed pixmapdir to 
     10        $(datadir)/pixmaps/gobby-0.5. 
     11 
     12        * pixmaps/Makefile.am: 
     13        * pixmaps/gobby-0.5.png: Moved from pixmaps/gobby.png. 
     14 
     15        * contrib/Makefile.am: 
     16        * contrib/gobby-0.5.desktop: Moved from gobby.desktop. 
     17 
     18        * configure.ac: Changed GETTEXT_PACKAGE from gobby to gobby05. 
     19 
     20        * code/core/iconmanager.cpp: Load gobby-0.5.png for the Gobby logo 
     21        instead of gobby.png. 
     22 
    1232008-10-16  Armin Burgmeier  <armin@arbur.net> 
    224 

  • code/Makefile.am

    rbd34be3 r3a1729a  
    1010 
    1111appicondir = $(datadir)/pixmaps 
    12 pixmapdir = $(datadir)/pixmaps/gobby 
     12pixmapdir = $(datadir)/pixmaps/gobby-0.5 
    1313 
    14 libgobby_a_CPPFLAGS = $(gobby_CFLAGS) -I. \ 
     14libgobby_a_CPPFLAGS = $(gobby_CFLAGS) -I$(top_srcdir)/code \ 
    1515                      -DAPPICON_DIR=\""$(appicondir)"\" \ 
    1616                      -DPIXMAPS_DIR=\""$(pixmapdir)"\" 

  • code/commands/Makefile.am

    rbd34be3 r3a1729a  
    1919        view-commands.hpp 
    2020 
    21 libgobby_commands_a_CPPFLAGS = $(gobby_CFLAGS) -I.. \ 
     21appicondir = $(datadir)/pixmaps 
     22pixmapdir = $(datadir)/pixmaps/gobby-0.5 
     23 
     24libgobby_commands_a_CPPFLAGS = $(gobby_CFLAGS) -I$(top_srcdir)/code \ 
    2225                              -DAPPICON_DIR=\""$(appicondir)"\" \ 
    2326                              -DPIXMAPS_DIR=\""$(pixmapdir)"\" 

  • code/core/Makefile.am

    r6c2a697 r3a1729a  
    3838 
    3939appicondir = $(datadir)/pixmaps 
    40 pixmapdir = $(datadir)/pixmaps/gobby 
     40pixmapdir = $(datadir)/pixmaps/gobby-0.5 
    4141 
    42 libgobby_core_a_CPPFLAGS = $(gobby_CFLAGS) -I.. \ 
     42libgobby_core_a_CPPFLAGS = $(gobby_CFLAGS) -I$(top_srcdir)/code \ 
    4343                          -DAPPICON_DIR=\""$(appicondir)"\" \ 
    4444                          -DPIXMAPS_DIR=\""$(pixmapdir)"\" 

  • code/core/iconmanager.cpp

    r4d4ee96 r3a1729a  
    4444                                subdir = "share/pixmaps"; 
    4545                        else 
    46                                 subdir = "share/pixmaps/gobby"; 
     46                                subdir = "share/pixmaps/gobby-0.5"; 
    4747 
    4848                        gchar* path = g_win32_get_package_installation_directory_of_module(NULL); 
    … …  
    7272// or menu sized items. It is not yet enabled therefore. 
    7373Gobby::IconManager::IconManager(): 
    74         gobby(load_pixbuf(APPICON_DIR, "gobby.png") ), 
     74        gobby(load_pixbuf(APPICON_DIR, "gobby-0.5.png") ), 
    7575        userlist(load_pixbuf(PIXMAPS_DIR, "userlist.png") ), 
    7676        doclist(load_pixbuf(PIXMAPS_DIR, "doclist.png") ), 

  • code/dialogs/Makefile.am

    rbd34be3 r3a1729a  
    1717        preferencesdialog.hpp 
    1818 
    19 libgobby_dialogs_a_CPPFLAGS = $(gobby_CFLAGS) -I.. \ 
     19appicondir = $(datadir)/pixmaps 
     20pixmapdir = $(datadir)/pixmaps/gobby-0.5 
     21 
     22libgobby_dialogs_a_CPPFLAGS = $(gobby_CFLAGS) -I$(top_srcdir)/code \ 
    2023                              -DAPPICON_DIR=\""$(appicondir)"\" \ 
    2124                              -DPIXMAPS_DIR=\""$(pixmapdir)"\" 

  • code/operations/Makefile.am

    rbd34be3 r3a1729a  
    1515        operation-save.hpp 
    1616 
    17 libgobby_operations_a_CPPFLAGS = $(gobby_CFLAGS) -I.. \ 
     17appicondir = $(datadir)/pixmaps 
     18pixmapdir = $(datadir)/pixmaps/gobby-0.5 
     19 
     20libgobby_operations_a_CPPFLAGS = $(gobby_CFLAGS) -I$(top_srcdir)/code \ 
    1821                              -DAPPICON_DIR=\""$(appicondir)"\" \ 
    1922                              -DPIXMAPS_DIR=\""$(pixmapdir)"\" 

  • code/util/Makefile.am

    rbd34be3 r3a1729a  
    2020        serialize.hpp 
    2121 
    22 libgobby_util_a_CPPFLAGS = $(gobby_CFLAGS) -I.. \ 
     22libgobby_util_a_CPPFLAGS = $(gobby_CFLAGS) -I$(top_srcdir)/code \ 
    2323                          -DAPPICON_DIR=\""$(appicondir)"\" \ 
    2424                          -DPIXMAPS_DIR=\""$(pixmapdir)"\" 

  • configure.ac

    r86c32c8 r3a1729a  
    7575AM_GLIB_DEFINE_LOCALEDIR(GOBBY_LOCALEDIR) 
    7676 
    77 GETTEXT_PACKAGE=$PACKAGE 
     77GETTEXT_PACKAGE=gobby05 
    7878AC_SUBST(GETTEXT_PACKAGE) 
    7979AC_DEFINE_UNQUOTED([GETTEXT_PACKAGE], ["${GETTEXT_PACKAGE}"], [gettext domain]) 

  • contrib/Makefile.am

    r36fa5fe r3a1729a  
    44# GNOME-specific installation. 
    55desktopdir = $(datadir)/applications 
    6 desktop_DATA = gobby.desktop 
     6desktop_DATA = gobby-0.5.desktop 
    77endif 
    88 
    9 EXTRA_DIST =  gobby.desktop 
     9EXTRA_DIST =  gobby-0.5.desktop 

  • pixmaps/Makefile.am

    r4e8f0f6 r3a1729a  
    11 
    22appicondir = $(datadir)/pixmaps 
    3 pixmapdir = $(datadir)/pixmaps/gobby 
     3pixmapdir = $(datadir)/pixmaps/gobby-0.5 
    44 
    5 dist_appicon_DATA = gobby.png 
     5dist_appicon_DATA = gobby-0.5.png 
    66dist_pixmap_DATA = userlist.png doclist.png save-all.svg