Generate compiled resourse files from *.rc.in files, without intermediate *.rc target

This commit is contained in:
Yevgen Muntyan 2006-12-12 22:43:15 -06:00
parent 9a8cbb41f2
commit a82d4d18f0
3 changed files with 11 additions and 13 deletions

View File

@ -57,7 +57,7 @@ AC_DEFUN([MOO_AC_FLAGS],[
# MooEdit stuff
#
if test "x$build_mooedit" != "xno"; then
MOO_CFLAGS="$MOO_CFLAGS $XML_CFLAGS -DMOO_TEXT_LANG_FILES_DIR=\\\"${MOO_TEXT_LANG_FILES_DIR}\\\""
MOO_CFLAGS="$MOO_CFLAGS $XML_CFLAGS"
MOO_LIBS="$MOO_LIBS $XML_LIBS"
fi
@ -68,10 +68,8 @@ AC_DEFUN([MOO_AC_FLAGS],[
MOO_INI_IN_IN_RULE='%.ini.desktop.in: %.ini.desktop.in.in $(top_builddir)/config.status ; cd $(top_builddir) && $(SHELL) ./config.status --file=$(subdir)/[$]@'
MOO_INI_IN_RULE='%.ini: %.ini.in $(top_builddir)/config.status ; cd $(top_builddir) && $(SHELL) ./config.status --file=$(subdir)/[$]@'
MOO_WIN32_RC_IN_RULE='%.rc: %.rc.in $(top_builddir)/config.status ; cd $(top_builddir) && $(SHELL) ./config.status --file=$(subdir)/[$]@'
MOO_WIN32_RC_RULE='%.res: %.rc ; $(WINDRES) -i $< --input-format=rc -o [$]@ -O coff'
MOO_WIN32_RC_RULE='%.res: %.rc.in $(top_builddir)/config.status ; cd $(top_builddir) && $(SHELL) ./config.status --file=$(subdir)/[$]*.rc && cd $(subdir) && $(WINDRES) -i [$]*.rc --input-format=rc -o [$]@ -O coff && rm [$]*.rc'
AC_SUBST(MOO_INI_IN_IN_RULE)
AC_SUBST(MOO_INI_IN_RULE)
AC_SUBST(MOO_WIN32_RC_IN_RULE)
AC_SUBST(MOO_WIN32_RC_RULE)
])

View File

@ -22,12 +22,11 @@ medit_LDADD = ../moo/libmoo.la
if MOO_OS_MINGW
medit_LDFLAGS += -mwindows
CLEANFILES = medit.res medit.rc
CLEANFILES = medit.res
@MOO_WIN32_RC_RULE@
medit_res_ldflag = -Wl,medit.res
BUILT_SOURCES += medit.res
nodist_medit_SOURCES += medit.res
@MOO_WIN32_RC_IN_RULE@
@MOO_WIN32_RC_RULE@
endif
XML2H = $(srcdir)/../moo/mooutils/xml2h.sh

View File

@ -62,16 +62,11 @@ noinst_LTLIBRARIES += libmoo.la
endif
if MOO_OS_MINGW
rc_files = $(rc_in_files:.rc.in=.rc)
@MOO_WIN32_RC_IN_RULE@
@MOO_WIN32_RC_RULE@
CLEANFILES += $(rc_files)
endif
if MOO_OS_MINGW
CLEANFILES += libmoo.res
libmoo_res_ldflag = -Wl,libmoo.res
BUILT_SOURCES += libmoo.res
nodist_libmoo_la_SOURCES = libmoo.res
endif
if MOO_ENABLE_TESTS
@ -112,8 +107,14 @@ endif MOO_INSTALL_LIB
else !MOO_OS_UNIX
if MOO_USE_PYGTK
if MOO_OS_MINGW
CLEANFILES += pymoo25.res moo25.res pymoo24.res moo24.res
BUILT_SOURCES += pymoo25.res moo25.res pymoo24.res moo24.res
nodist_pymoo25_la_SOURCES = pymoo25.res
nodist_moo25_la_SOURCES = moo25.res
nodist_pymoo24_la_SOURCES = pymoo24.res
nodist_moo24_la_SOURCES = moo24.res
endif
lib_LTLIBRARIES += pymoo25.la moo25.la pymoo24.la moo24.la
plugindir = $(MOO_LIB_DIR)/plugins