Reject/merge incompatible patch from Fedora.

This commit is contained in:
Jean-Paul Chaput 2009-09-01 22:40:38 +00:00
parent dc55b6fb42
commit 4718bd8abf
2 changed files with 153 additions and 145 deletions

View File

@ -1,143 +1,144 @@
bin_PROGRAMS = \
xgra
xgra_CPPFLAGS = \
$(GLIB_CFLAGS) \
-DG_LOG_DOMAIN=\"xgra\" \
$(MOTIF_CFLAGS) \
-DXGRA_DEFAULT_PARAM_NAME=\"${sysconfdir}/xgra.par\" \
-DXMS_FILE_NAME=\".xgra.cfg\" \
-I$(top_srcdir)/mbk/src \
-I$(top_srcdir)/aut/src
xgra_SOURCES = \
xgra.c \
xgra.h \
XGR_bound.c \
XGR_bound.h \
XGR_error.c \
XGR_error.h \
XGR_graph.c \
XGR_graph.h \
XGR_object.c \
XGR_object.h \
XGR_place.c \
XGR_place.h \
XGR_select.c \
XGR_select.h \
XGR.h \
XME_dialog.c \
XME_dialog.h \
XME_edit.c \
XME_edit.h \
XME.h \
XME_menu.c \
XME_menu.h \
XME_message.c \
XME_message.h \
XME_panel.c \
XME_panel.h \
XME_search.c \
XME_search.h \
XME_select.c \
XME_select.h \
XMF_dialog.c \
XMF_dialog.h \
XMF_file.c \
XMF_file.h \
XMF.h \
XMF_menu.c \
XMF_menu.h \
XMF_panel.c \
XMF_panel.h \
XMH.h \
XMH_help.c \
XMH_help.h \
XMH_menu.c \
XMH_menu.h \
XMH_panel.c \
XMH_panel.h \
XMS_dialog.c \
XMS_dialog.h \
XMS.h \
XMS_menu.c \
XMS_menu.h \
XMS_panel.c \
XMS_panel.h \
XMS_setup.c \
XMS_setup.h \
XMT_dialog.c \
XMT_dialog.h \
XMT.h \
XMT_menu.c \
XMT_menu.h \
XMT_message.c \
XMT_message.h \
XMT_panel.c \
XMT_panel.h \
XMT_tools.c \
XMT_tools.h \
XMV_dialog.c \
XMV_dialog.h \
XMV.h \
XMV_map.c \
XMV_map.h \
XMV_menu.c \
XMV_menu.h \
XMV_message.c \
XMV_message.h \
XMV_panel.c \
XMV_panel.h \
XMV_view.c \
XMV_view.h \
XMX_color.c \
XMX_color.h \
XMX_cursor.c \
XMX_cursor.h \
XMX_dialog.c \
XMX_dialog.h \
XMX_event.c \
XMX_event.h \
XMX_graphic.c \
XMX_graphic.h \
XMX_grid.c \
XMX_grid.h \
XMX.h \
XMX_icon.c \
XMX_icon.h \
XMX_menu.c \
XMX_menu.h \
XMX_message.c \
XMX_message.h \
XMX_motif.c \
XMX_motif.h \
XMX_panel.c \
XMX_panel.h \
XMX_view.c \
XMX_view.h \
XSB_error.c \
XSB_error.h \
XSB.h \
XSB_parse.c \
XSB_parse.h \
XSB_share.c \
XSB_share.h \
XTB_cursor.c \
XTB_cursor.h \
XTB_dialog.c \
XTB_dialog.h \
XTB.h \
XTB_icon.c \
XTB_icon.h \
XTB_menu.c \
XTB_menu.h \
XTB_panel.c \
XTB_panel.h \
XTB_pixmap.c \
XTB_pixmap.h
xgra_LDADD = \
$(GLIB_CFLAGS) \
$(MOTIF_LIBS) \
$(top_builddir)/src/aut/libAut.la \
$(top_builddir)/src/mbk/libMut.la
SUBDIRS = src etc
#bin_PROGRAMS = \
# xgra
#
#xgra_CPPFLAGS = \
# $(GLIB_CFLAGS) \
# -DG_LOG_DOMAIN=\"xgra\" \
# $(MOTIF_CFLAGS) \
# -DXGRA_DEFAULT_PARAM_NAME=\"${sysconfdir}/xgra.par\" \
# -DXMS_FILE_NAME=\".xgra.cfg\" \
# -I$(top_srcdir)/mbk/src \
# -I$(top_srcdir)/aut/src
#
#xgra_SOURCES = \
# xgra.c \
# xgra.h \
# XGR_bound.c \
# XGR_bound.h \
# XGR_error.c \
# XGR_error.h \
# XGR_graph.c \
# XGR_graph.h \
# XGR_object.c \
# XGR_object.h \
# XGR_place.c \
# XGR_place.h \
# XGR_select.c \
# XGR_select.h \
# XGR.h \
# XME_dialog.c \
# XME_dialog.h \
# XME_edit.c \
# XME_edit.h \
# XME.h \
# XME_menu.c \
# XME_menu.h \
# XME_message.c \
# XME_message.h \
# XME_panel.c \
# XME_panel.h \
# XME_search.c \
# XME_search.h \
# XME_select.c \
# XME_select.h \
# XMF_dialog.c \
# XMF_dialog.h \
# XMF_file.c \
# XMF_file.h \
# XMF.h \
# XMF_menu.c \
# XMF_menu.h \
# XMF_panel.c \
# XMF_panel.h \
# XMH.h \
# XMH_help.c \
# XMH_help.h \
# XMH_menu.c \
# XMH_menu.h \
# XMH_panel.c \
# XMH_panel.h \
# XMS_dialog.c \
# XMS_dialog.h \
# XMS.h \
# XMS_menu.c \
# XMS_menu.h \
# XMS_panel.c \
# XMS_panel.h \
# XMS_setup.c \
# XMS_setup.h \
# XMT_dialog.c \
# XMT_dialog.h \
# XMT.h \
# XMT_menu.c \
# XMT_menu.h \
# XMT_message.c \
# XMT_message.h \
# XMT_panel.c \
# XMT_panel.h \
# XMT_tools.c \
# XMT_tools.h \
# XMV_dialog.c \
# XMV_dialog.h \
# XMV.h \
# XMV_map.c \
# XMV_map.h \
# XMV_menu.c \
# XMV_menu.h \
# XMV_message.c \
# XMV_message.h \
# XMV_panel.c \
# XMV_panel.h \
# XMV_view.c \
# XMV_view.h \
# XMX_color.c \
# XMX_color.h \
# XMX_cursor.c \
# XMX_cursor.h \
# XMX_dialog.c \
# XMX_dialog.h \
# XMX_event.c \
# XMX_event.h \
# XMX_graphic.c \
# XMX_graphic.h \
# XMX_grid.c \
# XMX_grid.h \
# XMX.h \
# XMX_icon.c \
# XMX_icon.h \
# XMX_menu.c \
# XMX_menu.h \
# XMX_message.c \
# XMX_message.h \
# XMX_motif.c \
# XMX_motif.h \
# XMX_panel.c \
# XMX_panel.h \
# XMX_view.c \
# XMX_view.h \
# XSB_error.c \
# XSB_error.h \
# XSB.h \
# XSB_parse.c \
# XSB_parse.h \
# XSB_share.c \
# XSB_share.h \
# XTB_cursor.c \
# XTB_cursor.h \
# XTB_dialog.c \
# XTB_dialog.h \
# XTB.h \
# XTB_icon.c \
# XTB_icon.h \
# XTB_menu.c \
# XTB_menu.h \
# XTB_panel.c \
# XTB_panel.h \
# XTB_pixmap.c \
# XTB_pixmap.h
#
#xgra_LDADD = \
# $(GLIB_CFLAGS) \
# $(MOTIF_LIBS) \
# $(top_builddir)/src/aut/libAut.la \
# $(top_builddir)/src/mbk/libMut.la

View File

@ -2,8 +2,13 @@
bin_PROGRAMS = xgra
AM_CFLAGS = @ALLIANCE_CFLAGS@ @X_CFLAGS@ \
-I$(top_srcdir)/aut/src \
-I$(top_srcdir)/mbk/src \
-DXGRA_DEFAULT_PARAM_NAME=\"${ALLIANCE_TOP}/etc/xgra.par\" \
-DXMS_FILE_NAME=\".xgra.cfg\"
-DXMS_FILE_NAME=\".xgra.cfg\" \
$(GLIB_CFLAGS) \
-DG_LOG_DOMAIN=\"xgra\"
# -----------------------------------------------------------------------------
# X Libraries.
@ -37,7 +42,9 @@ ALL_X_LIBS = $(X_LDFLAGS) $(LIBXM) $(LIBXT) \
xgra_LDADD = @ALLIANCE_LIBS@ $(ALL_X_LIBS) \
xgra_LDADD = @ALLIANCE_LIBS@ $(GLIB_CFLAGS) $(ALL_X_LIBS) \
-L$(top_builddir)/aut/src \
-L$(top_builddir)/mbk/src \
-lAut -lMut
xgra_SOURCES = \