|
1 | | ---- cmd/gvedit/Makefile.in.orig 2023-07-07 02:42:43.000000000 -0500 |
2 | | -+++ cmd/gvedit/Makefile.in 2023-07-10 04:52:31.000000000 -0500 |
3 | | -@@ -123,9 +123,7 @@ |
4 | | - gvedit-mdichild.$(OBJEXT) $(am__objects_1) |
5 | | - gvedit_OBJECTS = $(am_gvedit_OBJECTS) |
| 1 | +--- cmd/gvedit/Makefile.in.orig 2025-10-19 11:08:31 |
| 2 | ++++ cmd/gvedit/Makefile.in 2025-11-05 22:18:00 |
| 3 | +@@ -115,7 +115,7 @@ |
| 4 | + PROGRAMS = $(bin_PROGRAMS) |
| 5 | + am_gvedit_OBJECTS = gvedit-main.$(OBJEXT) gvedit-csettings.$(OBJEXT) \ |
| 6 | + gvedit-imageviewer.$(OBJEXT) gvedit-mainwindow.$(OBJEXT) \ |
| 7 | +- gvedit-mdichild.$(OBJEXT) |
| 8 | ++ gvedit-mdichild.$(OBJEXT) gv_find_me.$(OBJEXT) |
| 9 | + am__objects_1 = gvedit-moc_csettings.$(OBJEXT) \ |
| 10 | + gvedit-moc_imageviewer.$(OBJEXT) \ |
| 11 | + gvedit-moc_mainwindow.$(OBJEXT) gvedit-moc_mdichild.$(OBJEXT) \ |
| 12 | +@@ -123,10 +123,7 @@ |
| 13 | + nodist_gvedit_OBJECTS = $(am__objects_1) |
| 14 | + gvedit_OBJECTS = $(am_gvedit_OBJECTS) $(nodist_gvedit_OBJECTS) |
6 | 15 | am__DEPENDENCIES_1 = |
7 | 16 | -gvedit_DEPENDENCIES = $(top_builddir)/lib/gvc/libgvc.la \ |
8 | 17 | - $(top_builddir)/lib/cgraph/libcgraph.la \ |
9 | | -- $(top_builddir)/lib/cdt/libcdt.la $(am__DEPENDENCIES_1) \ |
| 18 | +- $(top_builddir)/lib/cdt/libcdt.la \ |
| 19 | +- $(top_builddir)/lib/util/libutil_C.la $(am__DEPENDENCIES_1) \ |
10 | 20 | +gvedit_DEPENDENCIES = $(am__DEPENDENCIES_1) \ |
11 | 21 | $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ |
12 | 22 | $(am__DEPENDENCIES_1) |
13 | 23 | AM_V_lt = $(am__v_lt_@AM_V@) |
14 | | -@@ -620,9 +618,9 @@ |
15 | | - -DDEMAND_LOADING=1 |
| 24 | +@@ -587,7 +584,8 @@ |
| 25 | + -I$(top_srcdir)/lib/gvc \ |
| 26 | + -I$(top_srcdir)/lib/pathplan \ |
| 27 | + -I$(top_srcdir)/lib/cgraph \ |
| 28 | +- -I$(top_srcdir)/lib/cdt |
| 29 | ++ -I$(top_srcdir)/lib/cdt \ |
| 30 | ++ -I$(top_srcdir)/lib/util |
| 31 | + |
| 32 | + gvedit_CPPFLAGS = \ |
| 33 | + $(AM_CPPFLAGS) \ |
| 34 | +@@ -603,10 +601,9 @@ |
| 35 | + -DQT_USE_FAST_OPERATOR_PLUS |
16 | 36 |
|
17 | 37 | gvedit_LDADD = \ |
18 | 38 | - $(top_builddir)/lib/gvc/libgvc.la \ |
19 | 39 | - $(top_builddir)/lib/cgraph/libcgraph.la \ |
20 | 40 | - $(top_builddir)/lib/cdt/libcdt.la \ |
| 41 | +- $(top_builddir)/lib/util/libutil_C.la \ |
21 | 42 | + -lgvc \ |
22 | 43 | + -lcgraph \ |
23 | 44 | + -lcdt \ |
24 | 45 | $(QTGUI_LIBS) \ |
25 | 46 | $(QTCORE_LIBS) \ |
26 | 47 | $(EXPAT_LIBS) $(Z_LIBS) |
| 48 | +@@ -897,6 +894,16 @@ |
| 49 | + @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ |
| 50 | + @am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(gvedit_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o gvedit-qrc_mdi.obj `if test -f 'qrc_mdi.cpp'; then $(CYGPATH_W) 'qrc_mdi.cpp'; else $(CYGPATH_W) '$(srcdir)/qrc_mdi.cpp'; fi` |
| 51 | + |
| 52 | ++# libutil_C.a is a temporary internal library, therefore not available |
| 53 | ++# for standalone build of gvedit. Substitute by directly compiling |
| 54 | ++# the single necessary source file. |
| 55 | ++ |
| 56 | ++CC_COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ |
| 57 | ++ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) |
| 58 | ++ |
| 59 | ++gv_find_me.o: |
| 60 | ++ $(CC_COMPILE) -c -o $@ ../../lib/util/gv_find_me.c |
| 61 | ++ |
| 62 | + mostlyclean-libtool: |
| 63 | + -rm -f *.lo |
| 64 | + |
0 commit comments