diff options
author | Waldemar Brodkorb <wbx@openadk.org> | 2014-03-16 19:52:45 +0100 |
---|---|---|
committer | Waldemar Brodkorb <wbx@openadk.org> | 2014-03-16 19:52:45 +0100 |
commit | aaa312e56871e89b97704e5ac8c686fe7966c122 (patch) | |
tree | 63f6a6c3e89152025de942a0e68153a5cb868ecb /package/orbit2/patches/patch-src_idl-compiler_Makefile_in | |
parent | 9d097a780c0ffe2c9dbe146046d5b68123c47708 (diff) | |
parent | b1e843d40eea9bc684436f4635018b7c19eb93ea (diff) |
Merge branch 'master' of git+ssh://www.openadk.org/git/openadk
Conflicts:
TODO
Diffstat (limited to 'package/orbit2/patches/patch-src_idl-compiler_Makefile_in')
-rw-r--r-- | package/orbit2/patches/patch-src_idl-compiler_Makefile_in | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/package/orbit2/patches/patch-src_idl-compiler_Makefile_in b/package/orbit2/patches/patch-src_idl-compiler_Makefile_in index ec73ef4f3..f46b6169b 100644 --- a/package/orbit2/patches/patch-src_idl-compiler_Makefile_in +++ b/package/orbit2/patches/patch-src_idl-compiler_Makefile_in @@ -1,5 +1,5 @@ --- 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 ++++ ORBit2-2.14.19/src/idl-compiler/Makefile.in 2014-03-15 20:45:12.000000000 +0100 @@ -66,15 +66,13 @@ DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top depcomp = $(SHELL) $(top_srcdir)/depcomp am__depfiles_maybe = depfiles @@ -43,3 +43,12 @@ orbit_idl_2_LDADD = \ $(ORBIT_IDL_LIBS) \ +@@ -383,7 +380,7 @@ clean-binPROGRAMS: + rm -f $$list + orbit-idl-2$(EXEEXT): $(orbit_idl_2_OBJECTS) $(orbit_idl_2_DEPENDENCIES) + @rm -f orbit-idl-2$(EXEEXT) +- $(LINK) $(orbit_idl_2_OBJECTS) $(orbit_idl_2_LDADD) $(LIBS) ++ $(LINK) $(orbit_idl_2_OBJECTS) $(orbit_idl_2_LDADD) $(LIBS) $(LIBS_FOR_BUILD) + + mostlyclean-compile: + -rm -f *.$(OBJEXT) |