]> git.ipfire.org Git - thirdparty/dracut.git/commitdiff
chore(install): move install to src directory
authorJóhann B. Guðmundsson <johannbg@gmail.com>
Thu, 6 May 2021 13:29:19 +0000 (13:29 +0000)
committerHarald Hoyer <harald@hoyer.xyz>
Thu, 6 May 2021 14:25:32 +0000 (16:25 +0200)
Moving install to the src directory

14 files changed:
Makefile
src/install/.kateconfig [moved from install/.kateconfig with 100% similarity]
src/install/Makefile [moved from install/Makefile with 100% similarity]
src/install/dracut-install.c [moved from install/dracut-install.c with 100% similarity]
src/install/hashmap.c [moved from install/hashmap.c with 100% similarity]
src/install/hashmap.h [moved from install/hashmap.h with 100% similarity]
src/install/hashmap.lo [moved from install/hashmap.lo with 100% similarity]
src/install/log.c [moved from install/log.c with 100% similarity]
src/install/log.h [moved from install/log.h with 100% similarity]
src/install/macro.h [moved from install/macro.h with 100% similarity]
src/install/strv.c [moved from install/strv.c with 100% similarity]
src/install/strv.h [moved from install/strv.h with 100% similarity]
src/install/util.c [moved from install/util.c with 100% similarity]
src/install/util.h [moved from install/util.h with 100% similarity]

index 8b43d59b3bb5c89804dc0b627c2a605a14922f20..909d523c4ba14503fd6b2bbe1e80a1537009d0ac 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -57,28 +57,28 @@ all: dracut-version.sh dracut.pc dracut-install src/skipcpio/skipcpio dracut-uti
        $(CC) -c $(CFLAGS) $(CPPFLAGS) $(KMOD_CFLAGS) $< -o $@
 
 DRACUT_INSTALL_OBJECTS = \
-        install/dracut-install.o \
-        install/hashmap.o\
-        install/log.o \
-        install/strv.o \
-        install/util.o
+        src/install/dracut-install.o \
+        src/install/hashmap.o\
+        src/install/log.o \
+        src/install/strv.o \
+        src/install/util.o
 
 # deps generated with gcc -MM
-install/dracut-install.o: install/dracut-install.c install/log.h install/macro.h \
-       install/hashmap.h install/util.h
-install/hashmap.o: install/hashmap.c install/util.h install/macro.h install/log.h \
-       install/hashmap.h
-install/log.o: install/log.c install/log.h install/macro.h install/util.h
-install/util.o: install/util.c install/util.h install/macro.h install/log.h
-install/strv.o: install/strv.c install/strv.h install/util.h install/macro.h install/log.h
-
-install/dracut-install: $(DRACUT_INSTALL_OBJECTS)
+src/install/dracut-install.o: src/install/dracut-install.c src/install/log.h src/install/macro.h \
+       src/install/hashmap.h src/install/util.h
+src/install/hashmap.o: src/install/hashmap.c src/install/util.h src/install/macro.h src/install/log.h \
+       src/install/hashmap.h
+src/install/log.o: src/install/log.c src/install/log.h src/install/macro.h src/install/util.h
+src/install/util.o: src/install/util.c src/install/util.h src/install/macro.h src/install/log.h
+src/install/strv.o: src/install/strv.c src/install/strv.h src/install/util.h src/install/macro.h src/install/log.h
+
+src/install/dracut-install: $(DRACUT_INSTALL_OBJECTS)
        $(CC) $(LDFLAGS) -o $@ $(DRACUT_INSTALL_OBJECTS) $(LDLIBS) $(FTS_LIBS) $(KMOD_LIBS)
 
 logtee: src/logtee/logtee.c
        $(CC) $(LDFLAGS) -o $@ $<
 
-dracut-install: install/dracut-install
+dracut-install: src/install/dracut-install
        ln -fs $< $@
 
 SKIPCPIO_OBJECTS = src/skipcpio/skipcpio.o
@@ -187,8 +187,8 @@ endif
                        $(DESTDIR)$(systemdsystemunitdir)/initrd.target.wants/$$i; \
                done \
        fi
-       if [ -f install/dracut-install ]; then \
-               install -m 0755 install/dracut-install $(DESTDIR)$(pkglibdir)/dracut-install; \
+       if [ -f src/install/dracut-install ]; then \
+               install -m 0755 src/install/dracut-install $(DESTDIR)$(pkglibdir)/dracut-install; \
        fi
        if [ -f src/skipcpio/skipcpio ]; then \
                install -m 0755 src/skipcpio/skipcpio $(DESTDIR)$(pkglibdir)/skipcpio; \
@@ -217,7 +217,7 @@ clean:
        $(RM) test-*.img
        $(RM) dracut-*.rpm dracut-*.tar.bz2 dracut-*.tar.xz
        $(RM) dracut-version.sh
-       $(RM) dracut-install install/dracut-install $(DRACUT_INSTALL_OBJECTS)
+       $(RM) dracut-install src/install/dracut-install $(DRACUT_INSTALL_OBJECTS)
        $(RM) skipcpio/skipcpio $(SKIPCPIO_OBJECTS)
        $(RM) dracut-util util/util $(UTIL_OBJECTS)
        $(RM) $(manpages) dracut.html
similarity index 100%
rename from install/.kateconfig
rename to src/install/.kateconfig
similarity index 100%
rename from install/Makefile
rename to src/install/Makefile
similarity index 100%
rename from install/hashmap.c
rename to src/install/hashmap.c
similarity index 100%
rename from install/hashmap.h
rename to src/install/hashmap.h
similarity index 100%
rename from install/hashmap.lo
rename to src/install/hashmap.lo
similarity index 100%
rename from install/log.c
rename to src/install/log.c
similarity index 100%
rename from install/log.h
rename to src/install/log.h
similarity index 100%
rename from install/macro.h
rename to src/install/macro.h
similarity index 100%
rename from install/strv.c
rename to src/install/strv.c
similarity index 100%
rename from install/strv.h
rename to src/install/strv.h
similarity index 100%
rename from install/util.c
rename to src/install/util.c
similarity index 100%
rename from install/util.h
rename to src/install/util.h