grim/guifications1

Be quiet! (This silences the PACKAGE_* redefined warnings)

2004-05-24, Stu Tomlinson
410b220948b5
Parents ecd810011fbb
Children 61eefd061949
Be quiet! (This silences the PACKAGE_* redefined warnings)
4 files changed, 14 insertions(+), 6 deletions(-)
  • +3 -2
    .cvsignore
  • +1 -1
    Makefile.mingw
  • +1 -1
    configure.ac
  • +9 -2
    src/Makefile.am
    • --- a/.cvsignore Mon May 24 15:43:15 2004 +0000
    +++ b/.cvsignore Mon May 24 18:20:55 2004 +0000
    @@ -7,8 +7,6 @@
    config.status
    config.sub
    configure
    -gf_config.h
    -gf_config.h.in
    guifications.spec
    install-sh
    libtool
    @@ -17,3 +15,6 @@
    mkinstalldirs
    stamp-h
    stamp-h.in
    +gf_config.h
    +pre_config.h
    +pre_config.h.in
    --- a/Makefile.mingw Mon May 24 15:43:15 2004 +0000
    +++ b/Makefile.mingw Mon May 24 18:20:55 2004 +0000
    @@ -19,7 +19,7 @@
    GAIM_VERSION := $(shell cat ../../VERSION)
    all:
    - cp gf_config.h.mingw gf_config.h
    + cp gf_config.h.mingw $(GF_SRC)/gf_config.h
    $(MAKE) -C $(GF_SRC) -f Makefile.mingw
    install: all
    --- a/configure.ac Mon May 24 15:43:15 2004 +0000
    +++ b/configure.ac Mon May 24 18:20:55 2004 +0000
    @@ -116,7 +116,7 @@
    #
    # Finish up
    #
    -AM_CONFIG_HEADER(gf_config.h)
    +AM_CONFIG_HEADER(pre_config.h)
    AC_OUTPUT([Makefile
    pixmaps/Makefile
    src/Makefile
    --- a/src/Makefile.am Mon May 24 15:43:15 2004 +0000
    +++ b/src/Makefile.am Mon May 24 18:20:55 2004 +0000
    @@ -7,7 +7,7 @@
    gf_pngs.h \
    gf_gtkutils.h \
    gf_types.h
    -
    +
    plugindir = $(libdir)/gaim
    guifications_la_LDFLAGS = -module -avoid-version
    @@ -23,7 +23,7 @@
    gf_utils.c \
    gf_pngs.c \
    gf_gtkutils.c
    -
    +
    endif
    AM_CPPFLAGS = \
    @@ -34,3 +34,10 @@
    $(DEBUG_CFLAGS) \
    $(GTK_CFLAGS) \
    $(GLIB_CFLAGS)
    +
    +BUILT_SOURCES = ../gf_config.h
    +
    +$(OBJECTS): $(BUILT_SOURCES)
    +
    +../gf_config.h: ../pre_config.h
    + sed 's/#define PACKAGE/#define GF_PACKAGE/g' ../pre_config.h > $@