blob: 2053d9f2979f4e00483badf60503ac139890e5d1 (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
|
--- ORBit2-2.14.19.orig/src/idl-compiler/Makefile.in 2010-09-28 11:39:39.000000000 +0200
+++ ORBit2-2.14.19/src/idl-compiler/Makefile.in 2011-03-25 20:28:46.000000000 +0100
@@ -66,15 +66,13 @@ DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top
depcomp = $(SHELL) $(top_srcdir)/depcomp
am__depfiles_maybe = depfiles
am__mv = mv -f
-COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
- $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+COMPILE = $(CC_FOR_BUILD) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ $(CPPFLAGS_FOR_BUILD) $(CFLAGS_FOR_BUILD)
LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
- --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-CCLD = $(CC)
-LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
- --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
- $(LDFLAGS) -o $@
+ --mode=compile $(CC_FOR_BUILD) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ $(CPPFLAGS_FOR_BUILD) $(CFLAGS_FOR_BUILD)
+CCLD = $(CC_FOR_BUILD)
+LINK = $(CCLD) $(CFLAGS_FOR_BUILD) $(LDFLAGS_FOR_BUILD) -o $@
SOURCES = $(orbit_idl_2_SOURCES)
DIST_SOURCES = $(orbit_idl_2_SOURCES)
am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
@@ -178,8 +176,8 @@ ORBIT_ALIGNOF_CORBA_SHORT = @ORBIT_ALIGN
ORBIT_ALIGNOF_CORBA_STRUCT = @ORBIT_ALIGNOF_CORBA_STRUCT@
ORBIT_ALIGNOF_CORBA_WCHAR = @ORBIT_ALIGNOF_CORBA_WCHAR@
ORBIT_CFLAGS = @ORBIT_CFLAGS@
-ORBIT_IDL_CFLAGS = @ORBIT_IDL_CFLAGS@
-ORBIT_IDL_LIBS = @ORBIT_IDL_LIBS@
+ORBIT_IDL_CFLAGS =
+ORBIT_IDL_LIBS =
ORBIT_LIBS = @ORBIT_LIBS@
ORBIT_MAJOR_VERSION = @ORBIT_MAJOR_VERSION@
ORBIT_MICRO_VERSION = @ORBIT_MICRO_VERSION@
@@ -199,7 +197,7 @@ PACKAGE_URL = @PACKAGE_URL@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
-PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
+PKG_CONFIG_LIBDIR = $(PKG_HOSTLIB_DIR)
PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
RANLIB = @RANLIB@
SED = @SED@
@@ -270,8 +268,7 @@ INCLUDES = \
-DVERSION=\"$(ORBIT_VERSION)\" \
-DORBIT2_INTERNAL_API \
$(WARN_CFLAGS) \
- $(DISABLE_DEPRECATED_CFLAGS) \
- $(ORBIT_IDL_CFLAGS)
+ $(DISABLE_DEPRECATED_CFLAGS)
orbit_idl_2_LDADD = \
$(ORBIT_IDL_LIBS) \
|
