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

View File

@ -2,8 +2,13 @@
bin_PROGRAMS = xgra bin_PROGRAMS = xgra
AM_CFLAGS = @ALLIANCE_CFLAGS@ @X_CFLAGS@ \ 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\" \ -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. # 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 -lAut -lMut
xgra_SOURCES = \ xgra_SOURCES = \