diff options
| author | Luca Deri <lucaderi@users.noreply.github.com> | 2018-10-09 17:45:23 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-10-09 17:45:23 +0300 |
| commit | cf0c8be63d8f133cfc056e81c91f26d0bf5fa63a (patch) | |
| tree | 000c253701a58500dac1674696772fd5a2a3dc5d | |
| parent | ab2f3cefc89017d73e67faa4eb4011e7e3f2044d (diff) | |
| parent | 1d56c9aa1b4d8279a56baa3238f67e61ea901589 (diff) | |
Merge pull request #616 from wang-xuefei/dev
remake clean or remake install failed.
| -rw-r--r-- | example/Makefile.in | 2 | ||||
| -rw-r--r-- | src/lib/Makefile.in | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/example/Makefile.in b/example/Makefile.in index 7f465bdde..d3d4aed20 100644 --- a/example/Makefile.in +++ b/example/Makefile.in @@ -16,5 +16,5 @@ install: cp ndpiReader /usr/local/bin clean: - /bin/rm *.o ndpiReader + /bin/rm -f *.o ndpiReader diff --git a/src/lib/Makefile.in b/src/lib/Makefile.in index ca2900171..af7206ad0 100644 --- a/src/lib/Makefile.in +++ b/src/lib/Makefile.in @@ -38,7 +38,7 @@ $(NDPI_LIB_STATIC): $(OBJECTS) $(NDPI_LIB_SHARED): $(OBJECTS) $(CC) -shared -fPIC -o $@ $(OBJECTS) - ln -Fs $(NDPI_LIB_SHARED) $(NDPI_LIB_SHARED_BASE) + ln -Ffs $(NDPI_LIB_SHARED) $(NDPI_LIB_SHARED_BASE) %.o: %.c $(HEADERS) Makefile $(CC) $(CFLAGS) -c $< -o $@ @@ -49,6 +49,6 @@ clean: install: $(NDPI_LIBS) mkdir -p $(DESTDIR)$(libdir) cp $(NDPI_LIBS) $(DESTDIR)$(libdir)/ - ln -Fs $(DESTDIR)$(libdir)/$(NDPI_LIB_SHARED) $(DESTDIR)$(libdir)/$(NDPI_LIB_SHARED_BASE) + ln -Ffs $(DESTDIR)$(libdir)/$(NDPI_LIB_SHARED) $(DESTDIR)$(libdir)/$(NDPI_LIB_SHARED_BASE) mkdir -p $(DESTDIR)$(includedir) cp ../include/*.h $(DESTDIR)$(includedir) |