diff options
| author | Michael Stahl <mstahl@redhat.com> | 2013-04-10 16:00:44 +0200 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2013-04-10 16:21:42 +0200 |
| commit | c56013e97b7b5cf7a09a3ff99e0c172450dcb5a5 (patch) | |
| tree | c4eaa9994d4672acd3d1129eb06acef020b7aa9e /odk/settings | |
| parent | fb61a9c3fc491996cb1e96e579ef72d4d4d0f2a2 (diff) | |
API CHANGE: odk: remove "store" and "reg" libraries
These libraries were never part of the stable URE interface, and thus
including their headers and import libs in the SDK was a mistake.
Apparently at least on MacOSX and some Linux distros it was not
possible to link against the libraries anyway.
Change-Id: I3c43c86ff5d7bc316ed7af0be4ef313f7869ac23
Diffstat (limited to 'odk/settings')
| -rw-r--r-- | odk/settings/settings.mk | 16 |
1 files changed, 2 insertions, 14 deletions
diff --git a/odk/settings/settings.mk b/odk/settings/settings.mk index ad4697bcdcb5..acaabbc8a61a 100644 --- a/odk/settings/settings.mk +++ b/odk/settings/settings.mk @@ -88,8 +88,6 @@ CPPULIB=icppu.lib CPPUHELPERLIB=icppuhelper.lib SALHELPERLIB=isalhelper.lib PURPENVHELPERLIB=ipurpenvhelper.lib -REGLIB=ireg.lib -STORELIB=istore.lib BLANK= EMPTYSTRING= @@ -198,15 +196,11 @@ CPPU_ENV=gcc3 #CPPULIB=-luno_cppu #CPPUHELPERLIB=-luno_cppuhelperC52 #SALHELPERLIB=-luno_salhelperC52 -#REGLIB=-lreg -#STORELIB=-lstore SALLIB=-luno_sal CPPULIB=-luno_cppu CPPUHELPERLIB=-luno_cppuhelper$(COMID) SALHELPERLIB=-luno_salhelper$(COMID) PURPENVHELPERLIB=-luno_purpenvhelper$(COMID) -REGLIB=-lreg -STORELIB=-lstore EMPTYSTRING= PATH_SEPARATOR=: @@ -330,8 +324,6 @@ CPPULIB=-luno_cppu CPPUHELPERLIB=-luno_cppuhelper$(COMID) SALHELPERLIB=-luno_salhelper$(COMID) PURPENVHELPERLIB=-luno_purpenvhelper$(COMID) -REGLIB=-lreg -STORELIB=-lstore EMPTYSTRING= PATH_SEPARATOR=: @@ -437,12 +429,10 @@ CPPULIB=-luno_cppu CPPUHELPERLIB=-luno_cppuhelper$(COMID) SALHELPERLIB=-luno_salhelper$(COMID) PURPENVHELPERLIB=-luno_purpenvhelper$(COMID) -REGLIB=-lreg -STORELIB=-lstore -INSTALL_NAME_URELIBS=$(XCRUN) install_name_tool -change @__________________________________________________URELIB/libuno_sal.dylib.3 @executable_path/urelibs/libuno_sal.dylib.3 -change @__________________________________________________URELIB/libuno_cppu.dylib.3 @executable_path/urelibs/libuno_cppu.dylib.3 -change @__________________________________________________URELIB/libuno_cppuhelper$(COMID).dylib.3 @executable_path/urelibs/libuno_cppuhelper$(COMID).dylib.3 -change @__________________________________________________URELIB/libuno_salhelper$(COMID).dylib.3 @executable_path/urelibs/libuno_salhelper$(COMID).dylib.3 -change @__________________________________________________URELIB/libreg.dylib.3 @executable_path/urelibs/libreg.dylib.3 -change @__________________________________________________URELIB/libstore.dylib.3 @executable_path/urelibs/libstore.dylib.3 +INSTALL_NAME_URELIBS=$(XCRUN) install_name_tool -change @__________________________________________________URELIB/libuno_sal.dylib.3 @executable_path/urelibs/libuno_sal.dylib.3 -change @__________________________________________________URELIB/libuno_cppu.dylib.3 @executable_path/urelibs/libuno_cppu.dylib.3 -change @__________________________________________________URELIB/libuno_cppuhelper$(COMID).dylib.3 @executable_path/urelibs/libuno_cppuhelper$(COMID).dylib.3 -change @__________________________________________________URELIB/libuno_salhelper$(COMID).dylib.3 @executable_path/urelibs/libuno_salhelper$(COMID).dylib.3 -INSTALL_NAME_URELIBS_BIN=$(XCRUN) install_name_tool -change @__________________________________________________URELIB/libuno_sal.dylib.3 libuno_sal.dylib.3 -change @__________________________________________________URELIB/libuno_cppu.dylib.3 libuno_cppu.dylib.3 -change @__________________________________________________URELIB/libuno_cppuhelper$(COMID).dylib.3 libuno_cppuhelper$(COMID).dylib.3 -change @__________________________________________________URELIB/libuno_salhelper$(COMID).dylib.3 libuno_salhelper$(COMID).dylib.3 -change @__________________________________________________URELIB/libreg.dylib.3 libreg.dylib.3 -change @__________________________________________________URELIB/libstore.dylib.3 libstore.dylib.3 +INSTALL_NAME_URELIBS_BIN=$(XCRUN) install_name_tool -change @__________________________________________________URELIB/libuno_sal.dylib.3 libuno_sal.dylib.3 -change @__________________________________________________URELIB/libuno_cppu.dylib.3 libuno_cppu.dylib.3 -change @__________________________________________________URELIB/libuno_cppuhelper$(COMID).dylib.3 libuno_cppuhelper$(COMID).dylib.3 -change @__________________________________________________URELIB/libuno_salhelper$(COMID).dylib.3 libuno_salhelper$(COMID).dylib.3 EMPTYSTRING= PATH_SEPARATOR=: @@ -551,8 +541,6 @@ CPPULIB=-luno_cppu CPPUHELPERLIB=-luno_cppuhelper$(COMID) SALHELPERLIB=-luno_salhelper$(COMID) PURPENVHELPERLIB=-luno_purpenvhelper$(COMID) -REGLIB=-lreg -STORELIB=-lstore EMPTYSTRING= PATH_SEPARATOR=: |