From: Jóhann B. Guðmundsson <johannbg@gmail.com>
Date: Thu, 6 May 2021 13:29:19 +0000 (+0000)
Subject: chore(install): move install to src directory
X-Git-Tag: 054~24
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=3420a70dee112bc92ea6a805455846eeb139228e;p=thirdparty%2Fdracut.git

chore(install): move install to src directory

Moving install to the src directory
---

diff --git a/Makefile b/Makefile
index 8b43d59b3..909d523c4 100644
--- 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
diff --git a/install/.kateconfig b/src/install/.kateconfig
similarity index 100%
rename from install/.kateconfig
rename to src/install/.kateconfig
diff --git a/install/Makefile b/src/install/Makefile
similarity index 100%
rename from install/Makefile
rename to src/install/Makefile
diff --git a/install/dracut-install.c b/src/install/dracut-install.c
similarity index 100%
rename from install/dracut-install.c
rename to src/install/dracut-install.c
diff --git a/install/hashmap.c b/src/install/hashmap.c
similarity index 100%
rename from install/hashmap.c
rename to src/install/hashmap.c
diff --git a/install/hashmap.h b/src/install/hashmap.h
similarity index 100%
rename from install/hashmap.h
rename to src/install/hashmap.h
diff --git a/install/hashmap.lo b/src/install/hashmap.lo
similarity index 100%
rename from install/hashmap.lo
rename to src/install/hashmap.lo
diff --git a/install/log.c b/src/install/log.c
similarity index 100%
rename from install/log.c
rename to src/install/log.c
diff --git a/install/log.h b/src/install/log.h
similarity index 100%
rename from install/log.h
rename to src/install/log.h
diff --git a/install/macro.h b/src/install/macro.h
similarity index 100%
rename from install/macro.h
rename to src/install/macro.h
diff --git a/install/strv.c b/src/install/strv.c
similarity index 100%
rename from install/strv.c
rename to src/install/strv.c
diff --git a/install/strv.h b/src/install/strv.h
similarity index 100%
rename from install/strv.h
rename to src/install/strv.h
diff --git a/install/util.c b/src/install/util.c
similarity index 100%
rename from install/util.c
rename to src/install/util.c
diff --git a/install/util.h b/src/install/util.h
similarity index 100%
rename from install/util.h
rename to src/install/util.h