diff options
| author | Jeff Epler <jepler@unpythonic.net> | 2012-01-18 17:06:00 -0600 |
|---|---|---|
| committer | Jeff Epler <jepler@unpythonic.net> | 2012-01-18 17:06:00 -0600 |
| commit | 65cf9ebed45eb2921555e004f40d20cbc85dddf5 (patch) | |
| tree | 38aa2b27799fa1946a0929bb55aeba5ef860b62e /src/emc/pythonplugin | |
| parent | fecf2387f8fab1de9cedc043de07627a51efe3bd (diff) | |
| parent | b605c0182ee924a8a6013a4d74e97628d86a3b61 (diff) | |
| download | linuxcnc-65cf9ebed45eb2921555e004f40d20cbc85dddf5.tar.gz linuxcnc-65cf9ebed45eb2921555e004f40d20cbc85dddf5.zip | |
Merge remote-tracking branch 'origin/v2.5_branch'
Conflicts:
docs/man/man9/motion.9
docs/src/Submakefile
docs/src/gcode/overview.txt
scripts/linuxcnc.in
src/Makefile
src/emc/rs274ngc/Submakefile
src/emc/task/Submakefile
src/emc/usr_intf/emcsh.cc
Diffstat (limited to 'src/emc/pythonplugin')
| -rw-r--r-- | src/emc/pythonplugin/Submakefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/emc/pythonplugin/Submakefile b/src/emc/pythonplugin/Submakefile index f40ca86fe..b164ea865 100644 --- a/src/emc/pythonplugin/Submakefile +++ b/src/emc/pythonplugin/Submakefile @@ -15,7 +15,7 @@ $(call TOOBJSDEPS, $(LIBPPSRCS)) : EXTRAFLAGS=-fPIC $(BOOST_DEBUG_FLAGS) TARGETS += ../lib/libpyplugin.so.0 -../lib/libpyplugin.so.0: $(patsubst %.cc,objects/%.o,$(LIBPPSRCS)) ../lib/libemcini.so +../lib/libpyplugin.so.0: $(patsubst %.cc,objects/%.o,$(LIBPPSRCS)) ../lib/liblinuxcncini.so $(ECHO) Linking $(notdir $@) @mkdir -p ../lib @rm -f $@ |