diff options
| author | Andrew Duggan <aduggan@synaptics.com> | 2014-07-14 12:15:05 -0700 |
|---|---|---|
| committer | Andrew Duggan <aduggan@synaptics.com> | 2014-07-14 12:15:05 -0700 |
| commit | 6e63953362c4626342c1ee4467e39b68a05bd9f1 (patch) | |
| tree | 30793262b62920dfa79df05e60392efd76cffdf4 | |
| parent | 9409ec7a14c654a496d73bd973bbd273e684e03c (diff) | |
| download | platform_external_rmi4utils-6e63953362c4626342c1ee4467e39b68a05bd9f1.tar.gz platform_external_rmi4utils-6e63953362c4626342c1ee4467e39b68a05bd9f1.tar.bz2 platform_external_rmi4utils-6e63953362c4626342c1ee4467e39b68a05bd9f1.zip | |
Make makefile linking rules more consistent remove the LD indirection.
| -rw-r--r-- | rmi4update/Makefile | 3 | ||||
| -rw-r--r-- | rmidevice/Makefile | 4 | ||||
| -rw-r--r-- | rmihidtool/Makefile | 3 |
3 files changed, 4 insertions, 6 deletions
diff --git a/rmi4update/Makefile b/rmi4update/Makefile index 6f9f468..0cc3587 100644 --- a/rmi4update/Makefile +++ b/rmi4update/Makefile @@ -1,5 +1,4 @@ CXX = g++ -LD = $(CXX) CPPFLAGS = -I../include -I./include -I../rmidevice CXXFLAGS = -g -Wall LDFLAGS = -static -L. @@ -13,7 +12,7 @@ PROGNAME = rmi4update all: $(PROGNAME) $(PROGNAME): $(RMI4UPDATEOBJ) - $(LD) $(LDFLAGS) $(RMI4UPDATEOBJ) -L$(LIBDIR) $(LIBS) -o $(PROGNAME) + $(CXX) $(CXXFLAGS) $(LDFLAGS) $(RMI4UPDATEOBJ) -L$(LIBDIR) $(LIBS) -o $(PROGNAME) clean: rm -f $(RMI4UPDATEOBJ) $(PROGNAME) diff --git a/rmidevice/Makefile b/rmidevice/Makefile index 7ab2a40..e739392 100644 --- a/rmidevice/Makefile +++ b/rmidevice/Makefile @@ -1,5 +1,4 @@ CXX = g++ -LD = $(CXX) AR = ar RANLIB = ranlib CPPFLAGS = -I../include -I./include @@ -8,11 +7,12 @@ RMIDEVICESRC = rmifunction.cpp rmidevice.cpp hiddevice.cpp RMIDEVICEOBJ = $(RMIDEVICESRC:.cpp=.o) LIBNAME = librmidevice.so STATIC_LIBNAME = librmidevice.a +LDFLAGS = -shared -Wl,-soname,$(LIBNAME) all: $(LIBNAME) $(STATIC_LIBNAME) $(LIBNAME): $(RMIDEVICEOBJ) - $(CXX) -shared -Wl,-soname,$(LIBNAME) $^ -o $@ + $(CXX) $(CXXFLAGS) $(LDFLAGS) $^ -o $@ $(STATIC_LIBNAME): $(RMIDEVICEOBJ) $(AR) crv $(STATIC_LIBNAME) $^ diff --git a/rmihidtool/Makefile b/rmihidtool/Makefile index 17e2e70..41b94f3 100644 --- a/rmihidtool/Makefile +++ b/rmihidtool/Makefile @@ -1,5 +1,4 @@ CXX = g++ -LD = $(CXX) CPPFLAGS = -I../include -I./include -I../rmidevice CXXFLAGS = -g -Wall LDFLAGS = -static -L. @@ -13,7 +12,7 @@ PROGNAME = rmihidtool all: $(PROGNAME) $(PROGNAME): $(RMIHIDTOOLOBJ) - $(LD) $(LDFLAGS) $(RMIHIDTOOLOBJ) -L$(LIBDIR) $(LIBS) -o $(PROGNAME) + $(CXX) $(CXXFLAGS) $(LDFLAGS) $(RMIHIDTOOLOBJ) -L$(LIBDIR) $(LIBS) -o $(PROGNAME) clean: rm -f $(RMIHIDTOOLOBJ) $(PROGNAME) |