]>
Commit | Line | Data |
---|---|---|
62ddc6e2 MK |
1 | diff -ur ORBit2-2.14.19.orig/configure.in ORBit2-2.14.19/configure.in |
2 | --- ORBit2-2.14.19.orig/configure.in 2010-07-01 13:57:01.000000000 +0000 | |
3 | +++ ORBit2-2.14.19/configure.in 2013-04-01 20:41:55.902571944 +0000 | |
4 | @@ -262,7 +262,7 @@ | |
5 | ||
6 | if test "$enable_maintainer_mode" = "yes"; then | |
7 | DISABLE_DEPRECATED_CFLAGS=" \ | |
8 | - -DG_DISABLE_DEPRECATED -DG_DISABLE_SINGLE_INCLUDES" | |
9 | + -DG_DISABLE_SINGLE_INCLUDES" | |
10 | AC_SUBST(DISABLE_DEPRECATED_CFLAGS) | |
11 | fi | |
12 | ||
13 | diff -ur ORBit2-2.14.19.orig/linc2/src/Makefile.am ORBit2-2.14.19/linc2/src/Makefile.am | |
14 | --- ORBit2-2.14.19.orig/linc2/src/Makefile.am 2010-02-09 12:05:35.000000000 +0000 | |
15 | +++ ORBit2-2.14.19/linc2/src/Makefile.am 2013-04-01 20:42:37.883571886 +0000 | |
16 | @@ -12,8 +12,7 @@ | |
17 | -I$(top_builddir)/linc2/include \ | |
18 | -I$(top_srcdir)/linc2/include \ | |
19 | $(LINC_CFLAGS) \ | |
20 | - $(WARN_CFLAGS) \ | |
21 | - -DG_DISABLE_DEPRECATED | |
22 | + $(WARN_CFLAGS) | |
23 | ||
24 | if OS_WIN32 | |
25 | else | |
32660e5a JR |
26 | --- ORBit2-2.14.19/test/everything/Makefile.am~ 2013-12-07 10:59:17.000000000 +0100 |
27 | +++ ORBit2-2.14.19/test/everything/Makefile.am 2013-12-07 11:00:27.439835598 +0100 | |
28 | @@ -78,7 +78,7 @@ | |
29 | BUILT_SOURCES = ${EVERYTHING_BUILT} everything-imodule.c | |
30 | CLEANFILES = ${BUILT_SOURCES} iorfile | |
31 | ||
32 | -TESTS = $(srcdir)/test.sh | |
33 | +TESTS = test.sh | |
34 | ||
35 | EXTRA_DIST = $(IDL_FILES) test.sh $(included_src) | |
36 | ||
b70b80cb JP |
37 | diff -urN ORBit2-2.14.19.orig/src/services/name/Makefile.am ORBit2-2.14.19/src/services/name/Makefile.am |
38 | --- ORBit2-2.14.19.orig/src/services/name/Makefile.am 2019-03-15 10:25:22.576738108 +0100 | |
39 | +++ ORBit2-2.14.19/src/services/name/Makefile.am 2019-03-15 10:27:17.775898401 +0100 | |
40 | @@ -68,7 +68,7 @@ | |
41 | ||
42 | orbit_name_server_2_SOURCES = boot.c | |
43 | orbit_name_server_2_LDFLAGS = $(FLAGS) | |
44 | -orbit_name_server_2_DEPENDENCIES = $(DEPS) CosNaming.h | |
45 | +orbit_name_server_2_DEPENDENCIES = $(DEPS) CosNaming.h libname-server-2.a | |
46 | orbit_name_server_2_LDADD = libname-server-2.a $(LDADDS) | |
47 | ||
48 | $(libname_server_2_a_OBJECTS) $(name_client_2_OBJECTS) $(orbit_name_server_2_OBJECTS) : CosNaming.h |