app/Makefile.am change 2.6 to 2.7 here too.

2008-10-09  Michael Natterer  <mitch@gimp.org>

	* app/Makefile.am
	* tools/Makefile.am: change 2.6 to 2.7 here too.


svn path=/trunk/; revision=27188
This commit is contained in:
Michael Natterer 2008-10-09 08:28:39 +00:00 committed by Michael Natterer
parent 15c29ef124
commit 381d521499
2 changed files with 11 additions and 11 deletions

View File

@ -33,9 +33,9 @@ SUBDIRS = \
if ENABLE_GIMP_CONSOLE
bin_PROGRAMS = gimp-2.6 gimp-console-2.6
bin_PROGRAMS = gimp-2.7 gimp-console-2.7
else
bin_PROGRAMS = gimp-2.6
bin_PROGRAMS = gimp-2.7
endif
app_sources = \
@ -59,7 +59,7 @@ app_sources = \
gimp-log.h \
gimp-intl.h
gimp_2_6_SOURCES = $(app_sources)
gimp_2_7_SOURCES = $(app_sources)
EXTRA_DIST = \
@ -102,9 +102,9 @@ AM_LDFLAGS = \
-u $(SYMPREFIX)gimp_image_map_config_get_type \
-u $(SYMPREFIX)gimp_plug_in_manager_restore
gimp_2_6_LDFLAGS = $(AM_LDFLAGS) $(win32_ldflags)
gimp_2_7_LDFLAGS = $(AM_LDFLAGS) $(win32_ldflags)
gimp_2_6_LDADD = \
gimp_2_7_LDADD = \
gui/libappgui.a \
actions/libappactions.a \
dialogs/libappdialogs.a \
@ -146,13 +146,13 @@ gimp_2_6_LDADD = \
if ENABLE_GIMP_CONSOLE
gimp_console_2_6_SOURCES = $(app_sources)
gimp_console_2_7_SOURCES = $(app_sources)
gimp_console_2_6_CPPFLAGS = \
gimp_console_2_7_CPPFLAGS = \
$(AM_CPPFLAGS) \
-DGIMP_CONSOLE_COMPILATION
gimp_console_2_6_LDADD = \
gimp_console_2_7_LDADD = \
widgets/widgets-enums.o \
display/display-enums.o \
display/gimpdisplayoptions.o \

View File

@ -13,15 +13,15 @@ bin_PROGRAMS = $(GIMP_REMOTE) gimptool-2.0
noinst_PROGRAMS = test-clipboard
EXTRA_PROGRAMS = \
gimp-remote-2.6 \
gimp-remote-2.7 \
kernelgen
gimp_remote_2_6_SOURCES = \
gimp_remote_2_7_SOURCES = \
gimp-remote.c \
gimp-remote.h \
gimp-remote-x11.c
gimp_remote_2_6_LDADD = \
gimp_remote_2_7_LDADD = \
$(GTK_LIBS) \
$(XMU_LIBS)