| author | kergoth <kergoth> | 2003-01-16 04:41:29 (UTC) |
|---|---|---|
| committer | kergoth <kergoth> | 2003-01-16 04:41:29 (UTC) |
| commit | 8485d32aac0500a21d3b9b89df66900b427b57ee (patch) (side-by-side diff) | |
| tree | fb048c03107230a99a106c5cdd5c5c577032ec1e | |
| parent | 21cee2677c4a480f00675cdc9160e5d7e97e7122 (diff) | |
| download | opie-8485d32aac0500a21d3b9b89df66900b427b57ee.zip opie-8485d32aac0500a21d3b9b89df66900b427b57ee.tar.gz opie-8485d32aac0500a21d3b9b89df66900b427b57ee.tar.bz2 | |
Move stamp-headers files into qtdir per holger's request some time ago.
| -rw-r--r-- | Makefile.test | 4 | ||||
| -rw-r--r-- | Rules.make | 8 |
2 files changed, 6 insertions, 6 deletions
diff --git a/Makefile.test b/Makefile.test index 7befb39..15cd128 100644 --- a/Makefile.test +++ b/Makefile.test @@ -96,15 +96,15 @@ export QMAKESPEC=$(QMAKESPECSDIR)/$(patsubst "%",%,$(CONFIG_SPECFILE)) ifdef CONFIG_OPTIMIZATIONS export CFLAGS_RELEASE=$(patsubst "%,%,$(CONFIG_OPTIMIZATIONS)) export CFLAGS_RELEASE:=$(patsubst %",%,$(CFLAGS_RELEASE)) endif all clean: $(subdir-y) -$(subdir-y) : $(if $(CONFIG_LIBQPE),$(TOPDIR)/stamp-headers) \ - $(if $(CONFIG_LIBQPE-X11),$(TOPDIR)/stamp-headers-x11) \ +$(subdir-y) : $(if $(CONFIG_LIBQPE),$(QTDIR)/stamp-headers) \ + $(if $(CONFIG_LIBQPE-X11),$(QTDIR)/stamp-headers-x11) \ $(TOPDIR)/library/custom.h clean : $(TOPDIR)/.config include $(TOPDIR)/Rules.make @@ -19,18 +19,18 @@ $(TOPDIR)/.depends : $(shell if [ -e $(TOPDIR)/config.in ]\; then echo $(TOPDIR) $(TOPDIR)/scripts/deps.pl >> $(TOPDIR)/.depends $(TOPDIR)/.depends.cfgs: # config.in interdependencies @echo $(configs) | sed -e 's,/config.in,,g' | ( for i in `cat`; do echo $$i; done ) > dirs @cat dirs | ( for i in `cat`; do if [ "`cat dirs|grep $$i 2>/dev/null|wc -l`" -ne "1" ]; then deps=`cat dirs|grep $$i| grep -v "^$$i$$"|for i in \`cat|sed -e's,^$(TOPDIR)/,$$(TOPDIR)/,g'\`; do echo $$i/config.in; done`; echo `echo $$i/config.in|sed -e 's,^$(TOPDIR)/,$$(TOPDIR)/,'` : $$deps; fi; done ) >> $@ @-rm -f dirs -$(TOPDIR)/stamp-headers : - @-rm -f $(TOPDIR)/stamp-headers* +$(QTDIR)/stamp-headers : + @-rm -f $@* mkdir -p $(TOPDIR)/include/qpe $(TOPDIR)/include/qtopia \ $(TOPDIR)/include/opie $(TOPDIR)/include/qtopia/private ( cd include/qpe && rm -f *.h; ln -sf ../../library/*.h .; ln -sf ../../library/backend/*.h .; rm -f *_p.h; ) ( cd include/qtopia && rm -f *.h; ln -sf ../../library/*.h .; ) ( cd include/qtopia/private && rm -f *.h; ln -sf ../../../library/backend/*.h .; ) ( cd include/opie && rm -f *.h; ln -sf ../../libopie/*.h .; rm -f *_p.h; ) ( cd include/opie && ln -sf ../../libsql/*.h .; ) ( cd include/opie && ln -sf ../../libopie/pim/*.h .; ) @@ -38,18 +38,18 @@ $(TOPDIR)/stamp-headers : ln -sf ../../libopie/$$generatedHeader $$generatedHeader; done ) ln -sf ../../library/custom.h $(TOPDIR)/include/qpe/custom.h ( cd $(QTDIR)/include; \ $(patsubst %,ln -sf ../src/kernel/%;,qgfx_qws.h qwsmouse_qws.h \ qcopchannel_qws.h qwindowsystem_qws.h \ qfontmanager_qws.h qwsdefaultdecoration_qws.h)) touch $@ -$(TOPDIR)/stamp-headers-x11 : - @-rm -f $(TOPDIR)/stamp-headers* +$(QTDIR)/stamp-headers-x11 : + @-rm -f $@* mkdir -p $(TOPDIR)/include/qpe $(TOPDIR)/include/qtopia \ $(TOPDIR)/include/opie $(TOPDIR)/include/qtopia/private ( cd include/qpe && rm -f *.h; ln -sf ../../library/*.h .; ln -sf ../../library/backend/*.h .; rm -f *_p.h; ) ( cd include/qtopia && rm -f *.h; ln -sf ../../library/*.h .; ) ( cd include/qtopia/private && rm -f *.h; ln -sf ../../../library/backend/*.h .; ) ( cd include/opie && rm -f *.h; ln -sf ../../libopie/*.h .; rm -f *_p.h; ) ( cd include/opie && ln -sf ../../libsql/*.h .; ) ( cd include/opie && ln -sf ../../libopie/pim/*.h .; ) |