diff --git a/FL/makefile.inc b/FL/makefile.inc index 10e0bba..465d2f1 100644 --- a/FL/makefile.inc +++ b/FL/makefile.inc @@ -21,7 +21,7 @@ FL: FL/libfl_widgets.a ntk-chtheme: ntk-chtheme.o $(FLTK_LIBS) FL/libfl_widgets.a @ echo -n Linking session handler. - @ $(CXX) $(CXXFLAGS) $(FLTK_LDFLAGS) $(LIBS) $^ -o $@ -LFL -lfl_widgets && echo $(DONE) + @ $(CXX) $(CXXFLAGS) $^ -o $@ $(FLTK_LDFLAGS) $(LIBS) -LFL -lfl_widgets && echo $(DONE) clean: rm -f $(OBJS) FL/libfl_widgets.a .deps diff --git a/mixer/makefile.inc b/mixer/makefile.inc index 1937cfe..c484bf2 100644 --- a/mixer/makefile.inc +++ b/mixer/makefile.inc @@ -18,7 +18,7 @@ CFLAGS += $(FLTK_CFLAGS) $(JACK_CFLAGS) $(LIBLO_CFLAGS) $(SIGCPP_CFLAGS) $(XPM_C src/mixer: $(OBJS) FL/libfl_widgets.a nonlib/libnonlib.a $(FLTK_LIBS) @ echo -n Linking mixer... - @ $(CXX) $(CXXFLAGS) $(LIBS) $^ -o $@ -LFL -lfl_widgets -Lnonlib -lnonlib -ldl && echo $(DONE) + @ $(CXX) $(CXXFLAGS) $^ -o $@ $(LIBS) -LFL -lfl_widgets -Lnonlib -lnonlib -ldl && echo $(DONE) Mixer: src/mixer diff --git a/sequencer/makefile.inc b/sequencer/makefile.inc index 07e1165..fd5e18c 100644 --- a/sequencer/makefile.inc +++ b/sequencer/makefile.inc @@ -29,7 +29,7 @@ clean: src/sequencer: $(OBJS) FL/libfl_widgets.a nonlib/libnonlib.a $(FLTK_LIBS) @ echo -n Linking sequencer... - @ $(CXX) $(CXXFLAGS) $(LIBS) $^ -o $@ -LFL -lfl_widgets -Lnonlib -lnonlib -ldl && echo $(DONE) + $(CXX) $(CXXFLAGS) $^ -o $@ $(LIBS) -LFL -lfl_widgets -Lnonlib -lnonlib -ldl && echo $(DONE) ifeq ($(JACK_MIDI_PROTO_API),yes) diff --git a/session-manager/makefile.inc b/session-manager/makefile.inc index ac05471..1953ff3 100644 --- a/session-manager/makefile.inc +++ b/session-manager/makefile.inc @@ -18,11 +18,11 @@ CFLAGS += $(LIBLO_CFLAGS) $(SIGCPP_CFLAGS) $(XPM_CFLAGS) $(FLTK_CFLAGS) src/nsmd: src/nsmd.o nonlib/libnonlib.a @ echo -n Linking session handler. - @ $(CXX) $(CXXFLAGS) $(LIBS) $^ -o $@ -Lnonlib -lnonlib && echo $(DONE) + @ $(CXX) $(CXXFLAGS) $^ -o $@ $(LIBS) -Lnonlib -lnonlib && echo $(DONE) src/session-manager: src/session-manager.o nonlib/libnonlib.a $(FLTK_LIBS) @ echo -n Linking session handler. - @ $(CXX) $(CXXFLAGS) $(FLTK_LDFLAGS) $(XPM_LIBS) $(LIBS) $^ -o $@ -LFL -lfl_widgets -Lnonlib -lnonlib && echo $(DONE) + @ $(CXX) $(CXXFLAGS) $^ -o $@ $(FLTK_LDFLAGS) $(XPM_LIBS) $(LIBS) -LFL -lfl_widgets -Lnonlib -lnonlib && echo $(DONE) src/nsm-proxy: src/nsm-proxy.o nonlib/libnonlib.a @ echo -n Linking NSM Proxy. @@ -36,10 +36,10 @@ src/nsm-proxy-gui: src/NSM_Proxy_UI.o src/nsm-proxy-gui.o nonlib/libnonlib.a $(F @ $(CXX) $(CXXFLAGS) $(FLTK_LDFLAGS) $(XPM_LIBS) $(LIBS) $^ -o $@ -LFL -lfl_widgets -Lnonlib -lnonlib && echo $(DONE) src/send_osc: src/send_osc.o nonlib/libnonlib.a - @ $(CXX) $(CXXFLAGS) $(LIBS) $^ -o $@ -Lnonlib -lnonlib && echo $(DONE) + @ $(CXX) $(CXXFLAGS) $^ -o $@ $(LIBS) -Lnonlib -lnonlib && echo $(DONE) src/jackpatch: src/jackpatch.o - @ $(CXX) $(CXXFLAGS) $(JACK_LIBS) $(LIBLO_LIBS) $^ -o $@ && echo $(DONE) + @ $(CXX) $(CXXFLAGS) $^ -o $@ $(JACK_LIBS) $(LIBLO_LIBS) && echo $(DONE) Session: src/send_osc src/nsmd src/session-manager src/jackpatch src/nsm-proxy src/nsm-proxy-gui diff --git a/timeline/makefile.inc b/timeline/makefile.inc index 87b31e2..b70cce4 100644 --- a/timeline/makefile.inc +++ b/timeline/makefile.inc @@ -31,7 +31,7 @@ endif src/timeline: $(OBJS) FL/libfl_widgets.a nonlib/libnonlib.a $(FLTK_LIBS) @ echo -n Linking timeline... - @ $(CXX) $(CXXFLAGS) $(INCLUDES) $(LIBS) $^ -o $@ -LFL -lfl_widgets -Lnonlib -lnonlib && echo $(DONE) + $(CXX) $(CXXFLAGS) $(INCLUDES) $^ -o $@ $(LIBS) -LFL -lfl_widgets -Lnonlib -lnonlib && echo $(DONE) Timeline: src/timeline