summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNate Straz <nstraz@redhat.com>2005-09-13 16:01:28 +0000
committerNathan Straz <nstraz@redhat.com>2008-09-23 09:37:44 -0400
commitbf489daffc4902db3a9eb95d485fd867ac1ea524 (patch)
treec022f12c9d1bb8b56b566976cf5127b37112bbf1
parentc38e0fba0a10d5af0bb25f674177cb6404f73991 (diff)
downloadqarsh-bf489daffc4902db3a9eb95d485fd867ac1ea524.zip
qarsh-bf489daffc4902db3a9eb95d485fd867ac1ea524.tar.gz
qarsh-bf489daffc4902db3a9eb95d485fd867ac1ea524.tar.xz
Flatten the qarsh tree.
-rw-r--r--Makefile (renamed from qarsh/Makefile)14
-rw-r--r--btime.c (renamed from btime/btime.c)0
-rw-r--r--btime.h (renamed from btime/btime.h)0
-rw-r--r--btime/Makefile48
-rw-r--r--btime_int.h (renamed from btime/btime_int.h)0
-rw-r--r--btimec.c (renamed from btime/btimec.c)0
-rw-r--r--btimed.c (renamed from btime/btimed.c)0
-rw-r--r--qacp.c (renamed from qarsh/qacp.c)0
-rw-r--r--qarsh.c (renamed from qarsh/qarsh.c)0
-rw-r--r--qarsh_packet.c (renamed from qarsh/qarsh_packet.c)0
-rw-r--r--qarsh_packet.h (renamed from qarsh/qarsh_packet.h)0
-rw-r--r--qarshd.c (renamed from qarsh/qarshd.c)0
-rw-r--r--sockutil.c (renamed from qarsh/sockutil.c)0
-rw-r--r--sockutil.h (renamed from qarsh/sockutil.h)0
14 files changed, 12 insertions, 50 deletions
diff --git a/qarsh/Makefile b/Makefile
index 762b756..55b6c97 100644
--- a/qarsh/Makefile
+++ b/Makefile
@@ -1,5 +1,4 @@
-include ../../make/defines.mk
.PHONY: clean clobber uninstall
CFLAGS := -Wall -g -I/usr/include/libxml2
@@ -7,11 +6,13 @@ LOADLIBES := -lxml2
COMMON := qarsh_packet.c sockutil.c
-all: qarshd qarsh qacp
+all: qarshd qarsh qacp btimed btimec
qarshd: qarshd.c $(COMMON)
qarsh: qarsh.c $(COMMON)
qacp: qacp.c $(COMMON)
+btimed: btimed.c
+btimec: btimec.c btime.c
install: qarsh qarshd
@echo Installing qarsh daemon and client
@@ -19,11 +20,18 @@ install: qarsh qarshd
install qacp ${STSDIR}/bin
install qarsh ${STSDIR}/bin
install qarshd ${STSDIR}/bin
+
+ @echo "Installing btime deamon and test client"
+ @install -d ${STSDIR}/bin/
+ @install btimed ${STSDIR}/bin
+ @install btimec ${STSDIR}/bin
uninstall:
${UNINSTALL} qacp ${STSDIR}/bin
${UNINSTALL} qarsh ${STSDIR}/bin
${UNINSTALL} qarshd ${STSDIR}/bin
+ ${UNINSTALL} btimed ${STSDIR}/bin
+ ${UNINSTALL} btimec ${STSDIR}/bin
clean:
/bin/rm -f *.o
@@ -32,3 +40,5 @@ clobber:
/bin/rm -f qacp
/bin/rm -f qarsh
/bin/rm -f qarshd
+ /bin/rm -f btimec
+ /bin/rm -f btimed
diff --git a/btime/btime.c b/btime.c
index f22c08b..f22c08b 100644
--- a/btime/btime.c
+++ b/btime.c
diff --git a/btime/btime.h b/btime.h
index 41d3e39..41d3e39 100644
--- a/btime/btime.h
+++ b/btime.h
diff --git a/btime/Makefile b/btime/Makefile
deleted file mode 100644
index 6a2a454..0000000
--- a/btime/Makefile
+++ /dev/null
@@ -1,48 +0,0 @@
-include ../../make/defines.mk
-
-.PHONY: clean clobber uninstall
-
-CC = gcc
-AR = ar
-#CFLAGS += -g
-
-all: libbtime.a btimed btimec
-
-btimed: btimed.c btime_int.h
- $(CC) $(CFLAGS) -o btimed btimed.c
-
-btimec: btimec.c libbtime.a
- $(CC) $(CFLAGS) -L. -o btimec btimec.c -lbtime
-
-libbtime.a: btime.c btime_int.h
- $(CC) $(CFLAGS) -c btime.c
- $(AR) -rc libbtime.a btime.o
-
-install: btimed btimec libbtime.a
- @echo "Installing btime deamon and test client"
- @install -d ${STSDIR}/bin/
- @install btimed ${STSDIR}/bin
- @install btimec ${STSDIR}/bin
-
- @echo "Installing btime library"
- @install -d ${STSDIR}/lib/
- @install libbtime.a ${STSDIR}/lib
-
- @echo "Installing btime header"
- @install -d ${STSDIR}/include/
- @install btime.h ${STSDIR}/include
-
-
-uninstall:
- ${UNINSTALL} btimed ${STSDIR}/bin
- ${UNINSTALL} btimec ${STSDIR}/bin
-
-
-clean:
- /bin/rm -f *.o
-
-clobber:
- /bin/rm -f btimec
- /bin/rm -f btimed
- /bin/rm -f *.a *.o
-
diff --git a/btime/btime_int.h b/btime_int.h
index b2cafcd..b2cafcd 100644
--- a/btime/btime_int.h
+++ b/btime_int.h
diff --git a/btime/btimec.c b/btimec.c
index 02c29bc..02c29bc 100644
--- a/btime/btimec.c
+++ b/btimec.c
diff --git a/btime/btimed.c b/btimed.c
index 259c8aa..259c8aa 100644
--- a/btime/btimed.c
+++ b/btimed.c
diff --git a/qarsh/qacp.c b/qacp.c
index aa3f22e..aa3f22e 100644
--- a/qarsh/qacp.c
+++ b/qacp.c
diff --git a/qarsh/qarsh.c b/qarsh.c
index b0c4aab..b0c4aab 100644
--- a/qarsh/qarsh.c
+++ b/qarsh.c
diff --git a/qarsh/qarsh_packet.c b/qarsh_packet.c
index 76fadf1..76fadf1 100644
--- a/qarsh/qarsh_packet.c
+++ b/qarsh_packet.c
diff --git a/qarsh/qarsh_packet.h b/qarsh_packet.h
index c4316fd..c4316fd 100644
--- a/qarsh/qarsh_packet.h
+++ b/qarsh_packet.h
diff --git a/qarsh/qarshd.c b/qarshd.c
index ee9e556..ee9e556 100644
--- a/qarsh/qarshd.c
+++ b/qarshd.c
diff --git a/qarsh/sockutil.c b/sockutil.c
index b84e456..b84e456 100644
--- a/qarsh/sockutil.c
+++ b/sockutil.c
diff --git a/qarsh/sockutil.h b/sockutil.h
index 6e4b8dd..6e4b8dd 100644
--- a/qarsh/sockutil.h
+++ b/sockutil.h