diff options
| author | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2010-01-09 01:22:29 +0000 |
|---|---|---|
| committer | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2010-01-09 01:22:29 +0000 |
| commit | 977af731ca5f76799cdb7aa14e4f071c38f34999 (patch) | |
| tree | 9c547df2958c0e903c6b4563e220a25316cde504 /kjsembed | |
| parent | dff3f779e70064ee7d7a34a3afb003c7999f8994 (diff) | |
| download | tdebindings-977af731ca5f76799cdb7aa14e4f071c38f34999.tar.gz tdebindings-977af731ca5f76799cdb7aa14e4f071c38f34999.zip | |
* Updated automake/autoconf
* Detects Python 2.6
* Various compilation fixes
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdebindings@1071924 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'kjsembed')
| -rw-r--r-- | kjsembed/cpptests/jsaccess/Makefile.am | 2 | ||||
| -rw-r--r-- | kjsembed/plugins/Makefile.am | 8 | ||||
| -rw-r--r-- | kjsembed/stdlib/Makefile.am | 2 |
3 files changed, 6 insertions, 6 deletions
diff --git a/kjsembed/cpptests/jsaccess/Makefile.am b/kjsembed/cpptests/jsaccess/Makefile.am index eda2e3e1..175344b1 100644 --- a/kjsembed/cpptests/jsaccess/Makefile.am +++ b/kjsembed/cpptests/jsaccess/Makefile.am @@ -5,7 +5,7 @@ INCLUDES = -I$(QTDIR)/tools/designer/uilib -I$(srcdir)/../../../.. -I.. -I$(top_ INCLUDES += -DQT_CLEAN_NAMESPACE -DQT_NO_ASCII_CAST -bin_PROGRAMS = jsaccess +noinst_PROGRAMS = jsaccess jsaccess_SOURCES = jsaccess.cpp jsaccess_LDFLAGS = $(all_libraries) $(KDE_RPATH) diff --git a/kjsembed/plugins/Makefile.am b/kjsembed/plugins/Makefile.am index f3071bb2..ff2d954a 100644 --- a/kjsembed/plugins/Makefile.am +++ b/kjsembed/plugins/Makefile.am @@ -1,8 +1,8 @@ INCLUDES= -I$(srcdir)/.. -I$(srcdir)/../.. $(all_includes) KDE_CXXFLAGS = -DQT_NO_ASCII_CAST -DQT_CLEAN_NAMESPACE -kde_module_LTLIBRARIES = libcustomobjectplugin.la libcustomqobjectplugin.la \ - libimagefxplugin.la libqprocessplugin.la libfileitemplugin.la +kde_module_LTLIBRARIES = libimagefxplugin.la libqprocessplugin.la libfileitemplugin.la +noinst_LTLIBRARIES = libcustomobjectplugin.la libcustomqobjectplugin.la METASOURCES = AUTO # the Plugin's source, library search path, and link libraries @@ -33,6 +33,6 @@ libfileitemplugin_la_LIBADD = $(LIB_KPARTS) $(LIB_KFILE) ../libkjsembed.la # this is where the desktop file will go plugindesktopdir = $(kde_servicesdir) -plugindesktop_DATA = customobject_plugin.desktop customqobject_plugin.desktop imagefx_plugin.desktop\ - qprocess_plugin.desktop kfileitem_plugin.desktop +plugindesktop_DATA = imagefx_plugin.desktop qprocess_plugin.desktop kfileitem_plugin.desktop +noinst_DATA = customobject_plugin.desktop customqobject_plugin.desktop diff --git a/kjsembed/stdlib/Makefile.am b/kjsembed/stdlib/Makefile.am index bd7e241a..279c2bf6 100644 --- a/kjsembed/stdlib/Makefile.am +++ b/kjsembed/stdlib/Makefile.am @@ -1,5 +1,5 @@ # -*- makefile -*- jslibdir = $(kde_datadir)/kjsembed -jslib_DATA = cmdline.js +jslib_SCRIPTS = cmdline.js |