diff options
| author | Anders Wallin <anders.e.e.wallin@gmail.com> | 2011-11-19 23:25:28 +0200 |
|---|---|---|
| committer | Jeff Epler <jepler@unpythonic.net> | 2011-11-19 15:37:46 -0600 |
| commit | d8be12ea61aa55df7a9683d86997539be8750123 (patch) | |
| tree | 5bc3b8e6356607d6d020af27effe857c5e453891 | |
| parent | 7f4d8fe35d6a05ac65006af5164d0d626cd74e29 (diff) | |
| download | linuxcnc-d8be12ea61aa55df7a9683d86997539be8750123.tar.gz linuxcnc-d8be12ea61aa55df7a9683d86997539be8750123.zip | |
changes to make sim build on ubuntu 11.10
| -rw-r--r-- | src/emc/sai/Submakefile | 4 | ||||
| -rw-r--r-- | src/emc/task/Submakefile | 4 | ||||
| -rw-r--r-- | src/hal/user_comps/Submakefile | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/src/emc/sai/Submakefile b/src/emc/sai/Submakefile index 5edf0d969..d5e6a7d3f 100644 --- a/src/emc/sai/Submakefile +++ b/src/emc/sai/Submakefile @@ -7,6 +7,6 @@ USERSRCS += $(SAISRCS) # cludge around linking issue in taskclass $(call TOOBJSDEPS,$(SAISRCS)) : EXTRAFLAGS=-Dinterp_new=interp ../bin/rs274: $(call TOOBJS, $(SAISRCS)) ../lib/librs274.so.0 ../lib/libemc.a ../lib/libnml.so.0 \ - ../lib/libemchal.so.0 + ../lib/libemchal.so.0 ../lib/libemcini.so.0 ../lib/libpyplugin.so.0 $(ECHO) Linking $(notdir $@) - $(Q)$(CXX) $(LDFLAGS) -o $@ $^ $(ULFLAGS) -l$(LIBPYTHON) + $(Q)$(CXX) $(LDFLAGS) -o $@ $^ $(ULFLAGS) $(BOOST_PYTHON_LIBS) -l$(LIBPYTHON) diff --git a/src/emc/task/Submakefile b/src/emc/task/Submakefile index d74bc44a4..80d02ef73 100644 --- a/src/emc/task/Submakefile +++ b/src/emc/task/Submakefile @@ -29,9 +29,9 @@ USERSRCS += $(MILLTASKSRCS) #LDFLAGS += -../bin/milltask: $(call TOOBJS, $(MILLTASKSRCS)) ../lib/librs274.so.0 ../lib/libemc.a ../lib/libnml.so.0 ../lib/libemcini.so.0 ../lib/libposemath.so.0 ../lib/libemchal.so.0 +../bin/milltask: $(call TOOBJS, $(MILLTASKSRCS)) ../lib/librs274.so.0 ../lib/libemc.a ../lib/libnml.so.0 ../lib/libemcini.so.0 ../lib/libposemath.so.0 ../lib/libemchal.so.0 ../lib/libpyplugin.so.0 $(ECHO) Linking $(notdir $@) - $(CXX) $(LDFLAGS) -o $@ $^ + $(CXX) -o $@ $^ $(LDFLAGS) $(BOOST_PYTHON_LIBS) -l$(LIBPYTHON) TARGETS += ../bin/milltask diff --git a/src/hal/user_comps/Submakefile b/src/hal/user_comps/Submakefile index c375acfec..4e7b27867 100644 --- a/src/hal/user_comps/Submakefile +++ b/src/hal/user_comps/Submakefile @@ -18,7 +18,7 @@ USERSRCS += $(MODBUSSRCS) ../bin/gs2_vfd: $(call TOOBJS, $(MODBUSSRCS)) ../lib/libemchal.so.0 $(ECHO) Linking $(notdir $@) - $(Q)$(CC) $(LDFLAGS) $(MODBUSLDFLAGS) -o $@ $^ + $(Q)$(CC) -o $@ $^ $(LDFLAGS) $(MODBUSLDFLAGS) TARGETS += ../bin/gs2_vfd ifeq ($(HIDRAW_H_USABLE),yes) |